Added: puppet/deployment/repositories/manifests/subversion.pp
===================================================================
--- puppet/deployment/repositories/manifests/subversion.pp (rev 0)
+++ puppet/deployment/repositories/manifests/subversion.pp 2011-01-09 16:42:44 UTC (rev 753)
@@ -0,0 +1,40 @@
+class repositories::subversion {
+
+ subversion::repository { "/svn/adm/":
+ group => "mga-sysadmin",
+ commit_mail => ['mageia-sysadm@mageia.org', "sysadmin-commits@ml.$domain"],
+ syntax_check1 => 'check_puppet_templates',
+ syntax_check2 => 'check_puppet',
+ cia_post => true,
+ cia_module => "sysadm",
+ }
+
+ subversion::repository { "/svn/soft/":
+ group => "mga-packagers",
+ commit_mail => ['mageia-sysadm@mageia.org'],
+ cia_post => true,
+ cia_module => "soft",
+ }
+
+ subversion::repository { "/svn/web/":
+ group => "mga-committers",
+ cia_post => true,
+ cia_module => "web",
+ }
+
+ subversion::repository { "/svn/packages/":
+ group => "mga-packagers",
+ no_binary => true,
+ cia_post => true,
+ cia_module => "packages",
+ cia_ignore_author => '^schedbot$',
+ }
+
+ subversion::repository { "/svn/binrepos/cauldron/":
+ group => "mga-packagers",
+ cia_post => true,
+ cia_module => "binrepos",
+ cia_ignore_author => '^schedbot$',
+ }
+
+}
Modified: puppet/manifests/nodes.pp
===================================================================
--- puppet/manifests/nodes.pp 2011-01-09 12:53:57 UTC (rev 752)
+++ puppet/manifests/nodes.pp 2011-01-09 16:42:44 UTC (rev 753)
@@ -26,43 +26,8 @@
include restrictshell::allow_pkgsubmit
include openssh::ssh_keys_from_ldap
- subversion::repository { "/svn/adm/":
- group => "mga-sysadmin",
- commit_mail => ['mageia-sysadm@mageia.org', "sysadmin-commits@ml.$domain"],
- syntax_check1 => 'check_puppet_templates',
- syntax_check2 => 'check_puppet',
- cia_post => true,
- cia_module => "sysadm",
- }
+ include repositories::subversion
- subversion::repository { "/svn/soft/":
- group => "mga-packagers",
- commit_mail => ['mageia-sysadm@mageia.org'],
- cia_post => true,
- cia_module => "soft",
- }
-
- subversion::repository { "/svn/web/":
- group => "mga-committers",
- cia_post => true,
- cia_module => "web",
- }
-
- subversion::repository { "/svn/packages/":
- group => "mga-packagers",
- no_binary => true,
- cia_post => true,
- cia_module => "packages",
- cia_ignore_author => '^schedbot$',
- }
-
- subversion::repository { "/svn/binrepos/cauldron/":
- group => "mga-packagers",
- cia_post => true,
- cia_module => "binrepos",
- cia_ignore_author => '^schedbot$',
- }
-
subversion::snapshot { "/etc/puppet":
source => "svn://svn.mageia.org/svn/adm/puppet/"
}