diff options
| -rw-r--r-- | deployment/repositories/manifests/subversion.pp | 40 | ||||
| -rw-r--r-- | manifests/nodes.pp | 37 |
2 files changed, 41 insertions, 36 deletions
diff --git a/deployment/repositories/manifests/subversion.pp b/deployment/repositories/manifests/subversion.pp new file mode 100644 index 00000000..8070aefb --- /dev/null +++ b/deployment/repositories/manifests/subversion.pp @@ -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$', + } + +} diff --git a/manifests/nodes.pp b/manifests/nodes.pp index 36faef2b..fa14c9db 100644 --- a/manifests/nodes.pp +++ b/manifests/nodes.pp @@ -26,42 +26,7 @@ node valstar { 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", - } - - 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$', - } + include repositories::subversion subversion::snapshot { "/etc/puppet": source => "svn://svn.mageia.org/svn/adm/puppet/" |