aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPascal Terjan <pterjan@mageia.org>2020-06-29 22:59:10 +0000
committerPascal Terjan <pterjan@mageia.org>2020-06-29 22:59:10 +0000
commite095df853caaa21366d0f209bcdd688e356d95b7 (patch)
tree0661ef7e08395fc2d26f93b4b307d42a13910184
parent569ce06ea74f5d80e3a65b4e83e1f02a6ad9fae7 (diff)
downloadpuppet-e095df853caaa21366d0f209bcdd688e356d95b7.tar
puppet-e095df853caaa21366d0f209bcdd688e356d95b7.tar.gz
puppet-e095df853caaa21366d0f209bcdd688e356d95b7.tar.bz2
puppet-e095df853caaa21366d0f209bcdd688e356d95b7.tar.xz
puppet-e095df853caaa21366d0f209bcdd688e356d95b7.zip
More repository vhost fixes
This time it really looks like what I had tested...
-rw-r--r--modules/buildsystem/templates/vhost_repository.conf10
1 files changed, 5 insertions, 5 deletions
diff --git a/modules/buildsystem/templates/vhost_repository.conf b/modules/buildsystem/templates/vhost_repository.conf
index 9fa207a6..e082ffca 100644
--- a/modules/buildsystem/templates/vhost_repository.conf
+++ b/modules/buildsystem/templates/vhost_repository.conf
@@ -42,7 +42,10 @@ distros = scope.lookupvar('buildsystem::var::distros::distros')
distro = distros[distroname]
if distro['no_mirror'] -%>
Alias /<%= distribdir %>/<%= distroname %>/ "<%= bootstrap_reporoot %>/<%= distroname %>/"
-<%- end -%>
+<%-
+ end
+ }
+-%>
<Directory <%= bootstrap_reporoot %>>
Header append Cache-Control "public, must-revalidate"
@@ -56,7 +59,7 @@ distros = scope.lookupvar('buildsystem::var::distros::distros')
Options Indexes FollowSymLinks
</Directory>
- <Directory <%= mirror_reporoot %>>
+ <Directory <%= mirror_root %>>
Header append Cache-Control "public, must-revalidate"
<%-
for req in access_requires do
@@ -67,7 +70,4 @@ distros = scope.lookupvar('buildsystem::var::distros::distros')
-%>
Options Indexes FollowSymLinks
</Directory>
-<%-
- }
--%>
</VirtualHost>