diff options
| author | Nicolas Vigier <boklm@mageia.org> | 2013-05-23 15:05:39 +0000 |
|---|---|---|
| committer | Nicolas Vigier <boklm@mageia.org> | 2013-05-23 15:05:39 +0000 |
| commit | 671f605f00bc83d05a1190bfaea1b03e3d4cb135 (patch) | |
| tree | f2c87b7baa13fd6810b3e199b85b19125c66187e /deployment | |
| parent | 9a20a46ee4d1f91ee9895f9e567548742237cbc1 (diff) | |
| download | puppet-671f605f00bc83d05a1190bfaea1b03e3d4cb135.tar puppet-671f605f00bc83d05a1190bfaea1b03e3d4cb135.tar.gz puppet-671f605f00bc83d05a1190bfaea1b03e3d4cb135.tar.bz2 puppet-671f605f00bc83d05a1190bfaea1b03e3d4cb135.tar.xz puppet-671f605f00bc83d05a1190bfaea1b03e3d4cb135.zip | |
buildsystem: generate mgarepo.conf using $distros
Use settings from buildsystem::var::distros to create mgarep.conf.
Diffstat (limited to 'deployment')
| -rw-r--r-- | deployment/mga_buildsystem/manifests/config.pp | 22 |
1 files changed, 20 insertions, 2 deletions
diff --git a/deployment/mga_buildsystem/manifests/config.pp b/deployment/mga_buildsystem/manifests/config.pp index eac5d983..f3e9ad7c 100644 --- a/deployment/mga_buildsystem/manifests/config.pp +++ b/deployment/mga_buildsystem/manifests/config.pp @@ -19,10 +19,12 @@ class mga_buildsystem::config { uploadmail_to => "packages-commits@ml.${::domain}", } + $svn_hostname = "svn.$::domain" + $svn_root_packages = "svn://${svn_hostname}/svn/packages" class { 'buildsystem::var::mgarepo': submit_host => "pkgsubmit.${::domain}", - svn_hostname => "svn.$::domain", - svn_root_packages => "svn://svn.${::domain}/svn/packages", + svn_hostname => $svn_hostname, + svn_root_packages => $svn_root_packages, oldurl => "svn+ssh://svn.${::domain}/svn/packages/misc", conf => { 'global' => { @@ -83,6 +85,12 @@ class mga_buildsystem::config { 'media_types' => [ 'infra' ], }, } + $std_macros = { + 'distsuffix' => '.mga', + 'distribution' => 'Mageia', + 'vendor' => 'Mageia.Org', + '_real_vendor' => 'mageia', + } class { 'buildsystem::var::distros': default_distro => 'cauldron', distros => { @@ -92,6 +100,8 @@ class mga_buildsystem::config { 'base_media' => $std_base_media, 'branch' => 'Devel', 'version' => '3', + 'submit_allowed' => "${svn_root_packages}/cauldron", + 'macros' => $std_macros, }, '1' => { @@ -100,6 +110,8 @@ class mga_buildsystem::config { 'base_media' => $std_base_media, 'branch' => 'Official', 'version' => '1', + 'submit_allowed' => "${svn_root_packages}/updates/1", + 'macros' => $std_macros, }, '2' => { @@ -108,6 +120,8 @@ class mga_buildsystem::config { 'base_media' => $std_base_media, 'branch' => 'Official', 'version' => '2', + 'submit_allowed' => "${svn_root_packages}/updates/2", + 'macros' => $std_macros, }, 'infra_1' => { @@ -116,6 +130,8 @@ class mga_buildsystem::config { 'base_media' => $std_base_media, 'branch' => 'Official', 'version' => '1', + 'submit_allowed' => $svn_root_packages, + 'macros' => $std_macros, }, 'infra_2' => { @@ -124,6 +140,8 @@ class mga_buildsystem::config { 'base_media' => $std_base_media, 'branch' => 'Official', 'version' => '2', + 'submit_allowed' => $svn_root_packages, + 'macros' => $std_macros, }, } } |