aboutsummaryrefslogtreecommitdiffstats
path: root/deployment/mga_buildsystem/manifests/config.pp
diff options
context:
space:
mode:
Diffstat (limited to 'deployment/mga_buildsystem/manifests/config.pp')
-rw-r--r--deployment/mga_buildsystem/manifests/config.pp34
1 files changed, 26 insertions, 8 deletions
diff --git a/deployment/mga_buildsystem/manifests/config.pp b/deployment/mga_buildsystem/manifests/config.pp
index b693ae90..885d3c3d 100644
--- a/deployment/mga_buildsystem/manifests/config.pp
+++ b/deployment/mga_buildsystem/manifests/config.pp
@@ -142,7 +142,7 @@ class mga_buildsystem::config {
'vendor' => 'Mageia.Org',
'_real_vendor' => 'mageia',
}
- $repo_allow_from = [
+ $repo_allow_from_ips = [
$::nodes_ipaddr[valstar][ipv6],
$::nodes_ipaddr[valstar][ipv4],
$::nodes_ipaddr[duvel][ipv6],
@@ -151,7 +151,6 @@ class mga_buildsystem::config {
$::nodes_ipaddr[ecosse][ipv4],
$::nodes_ipaddr[jonund][ipv6],
$::nodes_ipaddr[jonund][ipv4],
- ".${::domain}",
'10.42.0',
$::nodes_ipaddr[rabbit][ipv4],
$::nodes_ipaddr[rabbit][ipv6],
@@ -162,6 +161,9 @@ class mga_buildsystem::config {
$::nodes_ipaddr[armagnac][ipv4],
$::nodes_ipaddr[armada][ipv4],
]
+ $repo_allow_from_domains = [
+ ".${::domain}",
+ ]
# the list of checks, actions, posts for cauldron in youri-upload
$cauldron_youri_upload_targets = {
@@ -538,7 +540,8 @@ class mga_buildsystem::config {
'version' => '6',
'submit_allowed' => "${svn_root_packages}/cauldron",
'macros' => $std_macros,
- 'repo_allow_from' => $repo_allow_from,
+ 'repo_allow_from_ips' => $repo_allow_from_ips,
+ 'repo_allow_from_domains' => $repo_allow_from_domains,
'youri' => {
'upload' => {
'targets' => $cauldron_youri_upload_targets,
@@ -565,7 +568,8 @@ class mga_buildsystem::config {
'version' => '1',
'submit_allowed' => "${svn_root_packages}/updates/1",
'macros' => $std_macros,
- 'repo_allow_from' => $repo_allow_from,
+ 'repo_allow_from_ips' => $repo_allow_from_ips,
+ 'repo_allow_from_domains' => $repo_allow_from_domains,
'youri' => {
'upload' => {
'targets' => $std_youri_upload_targets,
@@ -592,7 +596,8 @@ class mga_buildsystem::config {
'version' => '2',
'submit_allowed' => "${svn_root_packages}/updates/2",
'macros' => $std_macros,
- 'repo_allow_from' => $repo_allow_from,
+ 'repo_allow_from_ips' => $repo_allow_from_ips,
+ 'repo_allow_from_domains' => $repo_allow_from_domains,
'youri' => {
'upload' => {
'targets' => $std_youri_upload_targets,
@@ -620,7 +625,8 @@ class mga_buildsystem::config {
'submit_allowed' => "${svn_root_packages}/updates/3",
'backports_allowed' => "${svn_root_packages}/backports/3",
'macros' => $std_macros,
- 'repo_allow_from' => $repo_allow_from,
+ 'repo_allow_from_ips' => $repo_allow_from_ips,
+ 'repo_allow_from_domains' => $repo_allow_from_domains,
'youri' => {
'upload' => {
'targets' => $std_youri_upload_targets,
@@ -648,7 +654,8 @@ class mga_buildsystem::config {
'submit_allowed' => "${svn_root_packages}/updates/4",
'backports_allowed' => "${svn_root_packages}/backports/4",
'macros' => $std_macros,
- 'repo_allow_from' => $repo_allow_from,
+ 'repo_allow_from_ips' => $repo_allow_from_ips,
+ 'repo_allow_from_domains' => $repo_allow_from_domains,
'youri' => {
'upload' => {
'targets' => $std_youri_upload_targets,
@@ -676,7 +683,8 @@ class mga_buildsystem::config {
'submit_allowed' => "${svn_root_packages}/updates/5",
'backports_allowed' => "${svn_root_packages}/backports/5",
'macros' => $std_macros,
- 'repo_allow_from' => $repo_allow_from,
+ 'repo_allow_from_ips' => $repo_allow_from_ips,
+ 'repo_allow_from_domains' => $repo_allow_from_domains,
'youri' => {
'upload' => {
'targets' => $std_youri_upload_targets,
@@ -707,6 +715,8 @@ 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,
@@ -738,6 +748,8 @@ 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,
@@ -769,6 +781,8 @@ 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,
@@ -800,6 +814,8 @@ 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,
@@ -831,6 +847,8 @@ 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,