diff options
author | Nicolas Vigier <boklm@mageia.org> | 2013-05-23 15:05:31 +0000 |
---|---|---|
committer | Nicolas Vigier <boklm@mageia.org> | 2013-05-23 15:05:31 +0000 |
commit | 0a6dbab426b5a58db0044ce952c1362d8c781dfb (patch) | |
tree | b57628ce8541a66d8de267b51250e3e24979853e /deployment/mga_buildsystem/manifests | |
parent | 98fa28e23cbd8ac75e428b1bee6b89cdbbe0d5bf (diff) | |
download | puppet-0a6dbab426b5a58db0044ce952c1362d8c781dfb.tar puppet-0a6dbab426b5a58db0044ce952c1362d8c781dfb.tar.gz puppet-0a6dbab426b5a58db0044ce952c1362d8c781dfb.tar.bz2 puppet-0a6dbab426b5a58db0044ce952c1362d8c781dfb.tar.xz puppet-0a6dbab426b5a58db0044ce952c1362d8c781dfb.zip |
Add buildsystem::var::mgarepo.
The mgarepo.conf template is now using settings from
buildsystem::var::mgarepo.
Diffstat (limited to 'deployment/mga_buildsystem/manifests')
-rw-r--r-- | deployment/mga_buildsystem/manifests/config.pp | 16 |
1 files changed, 16 insertions, 0 deletions
diff --git a/deployment/mga_buildsystem/manifests/config.pp b/deployment/mga_buildsystem/manifests/config.pp index ffb14ec3..eac5d983 100644 --- a/deployment/mga_buildsystem/manifests/config.pp +++ b/deployment/mga_buildsystem/manifests/config.pp @@ -19,6 +19,21 @@ class mga_buildsystem::config { uploadmail_to => "packages-commits@ml.${::domain}", } + class { 'buildsystem::var::mgarepo': + submit_host => "pkgsubmit.${::domain}", + svn_hostname => "svn.$::domain", + svn_root_packages => "svn://svn.${::domain}/svn/packages", + oldurl => "svn+ssh://svn.${::domain}/svn/packages/misc", + conf => { + 'global' => { + 'ldap-server' => "ldap.${::domain}", + 'ldap-base' => "ou=People,${::dc_suffix}", + 'ldap-filterformat' => '(&(objectClass=inetOrgPerson)(uid=$username))', + 'ldap-resultformat' => '$cn <$mail>', + } + } + } + $std_arch = ['i586', 'x86_64'] $std_repos = { 'release' => { @@ -69,6 +84,7 @@ class mga_buildsystem::config { }, } class { 'buildsystem::var::distros': + default_distro => 'cauldron', distros => { 'cauldron' => { 'arch' => $std_arch, |