diff options
| author | Pascal Terjan <pterjan@mageia.org> | 2020-06-28 20:48:06 +0000 |
|---|---|---|
| committer | Pascal Terjan <pterjan@mageia.org> | 2020-06-28 20:48:06 +0000 |
| commit | ec92e347631abc76485aae135691d93e707dcc4b (patch) | |
| tree | e0c6a2aa3653d1e30431363299485f5d30304604 /deployment/mga_buildsystem/manifests | |
| parent | b25a543dfd218cc5725d82fec4dbd9af1f50564b (diff) | |
| download | puppet-ec92e347631abc76485aae135691d93e707dcc4b.tar puppet-ec92e347631abc76485aae135691d93e707dcc4b.tar.gz puppet-ec92e347631abc76485aae135691d93e707dcc4b.tar.bz2 puppet-ec92e347631abc76485aae135691d93e707dcc4b.tar.xz puppet-ec92e347631abc76485aae135691d93e707dcc4b.zip | |
Simplify repository vhost
We use the same access list for all versions of the distribution
on the HTPP server (our internal machines) so there is no reason
to duplicate it per distro.
This also allows to access files at the top level directory (like
mageia_timestamp).
Diffstat (limited to 'deployment/mga_buildsystem/manifests')
| -rw-r--r-- | deployment/mga_buildsystem/manifests/config.pp | 12 |
1 files changed, 2 insertions, 10 deletions
diff --git a/deployment/mga_buildsystem/manifests/config.pp b/deployment/mga_buildsystem/manifests/config.pp index d33c7d25..4200f614 100644 --- a/deployment/mga_buildsystem/manifests/config.pp +++ b/deployment/mga_buildsystem/manifests/config.pp @@ -400,6 +400,8 @@ class mga_buildsystem::config { class { 'buildsystem::var::distros': default_distro => 'cauldron', + repo_allow_from_ips => $repo_allow_from_ips, + repo_allow_from_domains => $repo_allow_from_domains, distros => { 'cauldron' => { 'arch' => concat($std_arch, ['armv7hl', 'aarch64']), @@ -411,8 +413,6 @@ class mga_buildsystem::config { 'version' => '8', 'submit_allowed' => "${svn_root_packages}/cauldron", 'macros' => $std_macros, - 'repo_allow_from_ips' => $repo_allow_from_ips, - 'repo_allow_from_domains' => $repo_allow_from_domains, 'youri' => { 'upload' => { 'targets' => $cauldron_youri_upload_targets, @@ -441,8 +441,6 @@ class mga_buildsystem::config { 'submit_allowed' => "${svn_root_packages}/updates/6", 'backports_allowed' => "${svn_root_packages}/backports/6", 'macros' => $std_macros, - 'repo_allow_from_ips' => $repo_allow_from_ips, - 'repo_allow_from_domains' => $repo_allow_from_domains, 'youri' => { 'upload' => { 'targets' => $mga6_youri_upload_targets, @@ -471,8 +469,6 @@ class mga_buildsystem::config { 'submit_allowed' => "${svn_root_packages}/updates/7", 'backports_allowed' => "${svn_root_packages}/backports/7", 'macros' => $std_macros, - 'repo_allow_from_ips' => $repo_allow_from_ips, - 'repo_allow_from_domains' => $repo_allow_from_domains, 'youri' => { 'upload' => { 'targets' => $mga7_youri_upload_targets, @@ -503,8 +499,6 @@ class mga_buildsystem::config { 'core' => [ 'release', 'updates' ], }, }, - 'repo_allow_from_ips' => $repo_allow_from_ips, - 'repo_allow_from_domains' => $repo_allow_from_domains, 'youri' => { 'upload' => { 'targets' => $infra_youri_upload_targets, @@ -536,8 +530,6 @@ class mga_buildsystem::config { 'core' => [ 'release', 'updates' ], }, }, - 'repo_allow_from_ips' => $repo_allow_from_ips, - 'repo_allow_from_domains' => $repo_allow_from_domains, 'youri' => { 'upload' => { 'targets' => $infra_youri_upload_targets, |