diff options
| author | Nicolas Vigier <boklm@mageia.org> | 2013-05-23 15:05:56 +0000 |
|---|---|---|
| committer | Nicolas Vigier <boklm@mageia.org> | 2013-05-23 15:05:56 +0000 |
| commit | 255c868d79be6b2725570a70c51ce9e54e9313bd (patch) | |
| tree | b9816e304b8d54bb6dcb701721dc38a67425b9b7 /deployment | |
| parent | 283e0a113727d6af901537a3b481683b3379112b (diff) | |
| download | puppet-255c868d79be6b2725570a70c51ce9e54e9313bd.tar puppet-255c868d79be6b2725570a70c51ce9e54e9313bd.tar.gz puppet-255c868d79be6b2725570a70c51ce9e54e9313bd.tar.bz2 puppet-255c868d79be6b2725570a70c51ce9e54e9313bd.tar.xz puppet-255c868d79be6b2725570a70c51ce9e54e9313bd.zip | |
buildsystem: don't hardcode distros in vhost_repository.conf
Use buildsystem::var::distros settings in vhost_repository.conf
template.
The URLs for the infra_1 and infra_2 repositories have been changed, and
will need to be updated in urpmi configuration on servers using those
repositories.
The old URLs were :
- http://repository.mageia.org/distrib/infra_1/
- http://repository.mageia.org/distrib/infra_2/
The new URLs are now :
- http://repository.mageia.org/bootstrap/infra_1/
- http://repository.mageia.org/bootstrap/infra_2/
Diffstat (limited to 'deployment')
| -rw-r--r-- | deployment/mga_buildsystem/manifests/config.pp | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/deployment/mga_buildsystem/manifests/config.pp b/deployment/mga_buildsystem/manifests/config.pp index f3e9ad7c..a9b82b2a 100644 --- a/deployment/mga_buildsystem/manifests/config.pp +++ b/deployment/mga_buildsystem/manifests/config.pp @@ -91,6 +91,14 @@ class mga_buildsystem::config { 'vendor' => 'Mageia.Org', '_real_vendor' => 'mageia', } + $repo_allow_from = [ + '2a02:2178:2:7::3/64', # valstar + '2a02:2178:2:7::4/64', # ecosse + '2a02:2178:2:7::5/64', # jonund + ".${::domain}", + '10.42.0', + '212.85.158.152', #rabbit + ] class { 'buildsystem::var::distros': default_distro => 'cauldron', distros => { @@ -102,6 +110,7 @@ class mga_buildsystem::config { 'version' => '3', 'submit_allowed' => "${svn_root_packages}/cauldron", 'macros' => $std_macros, + 'repo_allow_from' => $repo_allow_from, }, '1' => { @@ -112,6 +121,7 @@ class mga_buildsystem::config { 'version' => '1', 'submit_allowed' => "${svn_root_packages}/updates/1", 'macros' => $std_macros, + 'repo_allow_from' => $repo_allow_from, }, '2' => { @@ -122,6 +132,7 @@ class mga_buildsystem::config { 'version' => '2', 'submit_allowed' => "${svn_root_packages}/updates/2", 'macros' => $std_macros, + 'repo_allow_from' => $repo_allow_from, }, 'infra_1' => { |