aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPascal Terjan <pterjan@mageia.org>2020-06-29 17:40:31 +0000
committerPascal Terjan <pterjan@mageia.org>2020-06-29 17:40:31 +0000
commitc601d6e5eb070ff2beefe3a3f11453841b8d3fe1 (patch)
treebeeb9a8f4412c3c30575e3dba944af94e3c2cc42
parent28a14212683f2ce96c6f27e3bf8a76c1b4fb7f57 (diff)
downloadpuppet-c601d6e5eb070ff2beefe3a3f11453841b8d3fe1.tar
puppet-c601d6e5eb070ff2beefe3a3f11453841b8d3fe1.tar.gz
puppet-c601d6e5eb070ff2beefe3a3f11453841b8d3fe1.tar.bz2
puppet-c601d6e5eb070ff2beefe3a3f11453841b8d3fe1.tar.xz
puppet-c601d6e5eb070ff2beefe3a3f11453841b8d3fe1.zip
Fix repository vhost
Previous commit broke it but is was not visible initially due to another broken thing in the config which has since been fixed.
-rw-r--r--modules/buildsystem/manifests/var/distros.pp13
1 files changed, 7 insertions, 6 deletions
diff --git a/modules/buildsystem/manifests/var/distros.pp b/modules/buildsystem/manifests/var/distros.pp
index 72b386cc..0299c87c 100644
--- a/modules/buildsystem/manifests/var/distros.pp
+++ b/modules/buildsystem/manifests/var/distros.pp
@@ -1,5 +1,9 @@
# $default_distro:
# the name of the default distribution
+# $repo_allow_from_ips:
+# $repo_allow_from_domains:
+# list of IP or domains allowed to access the repository. If you don't want to
+# filter allowed IPs, don't those values.
# $distros:
# a hash variable containing distributions informations indexed by
# distribution name. Each distribution is itself an hash containing
@@ -72,11 +76,6 @@
# # set this if the distro is not mirrored. This is used to add
# # an Alias in the vhost.
# 'no_mirror' => true,
-# # list of IP or hostnames allowed to access this distro on the
-# # repository. If you don't want to filter allowed IPs, don't set
-# # this value
-# 'repo_allow_from_ips' => [ '127.0.0.1', '10.0.0.1' ],
-# 'repo_allow_from_domains' => [ ".${::domain}" ],
# Optionally, the distribution can be based on the repos from an other
# distribution. In this example we're saying that the distribution is
# based on 2/core/release and 2/core/updates.
@@ -121,5 +120,7 @@
# }
class buildsystem::var::distros(
$default_distro,
- $distros
+ $repo_allow_from_ips,
+ $repo_allow_from_domains,
+ $distros,
) { }