From ec92e347631abc76485aae135691d93e707dcc4b Mon Sep 17 00:00:00 2001
From: Pascal Terjan <pterjan@mageia.org>
Date: Sun, 28 Jun 2020 20:48:06 +0000
Subject: 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).
---
 deployment/mga_buildsystem/manifests/config.pp | 12 ++----------
 1 file changed, 2 insertions(+), 10 deletions(-)

(limited to 'deployment/mga_buildsystem')

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,
-- 
cgit v1.2.1