diff options
| author | Nicolas Vigier <boklm@mageia.org> | 2013-05-31 09:22:33 +0000 |
|---|---|---|
| committer | Nicolas Vigier <boklm@mageia.org> | 2013-05-31 09:22:33 +0000 |
| commit | ebdad53512ac5e5356c072e8819631ef03893e9f (patch) | |
| tree | 085339ed51e6e53ae1b9b6dbb36198c96d299217 /modules/buildsystem/templates | |
| parent | f3d0be6bd085bbd9d73b6721610532437a622aa4 (diff) | |
| download | puppet-ebdad53512ac5e5356c072e8819631ef03893e9f.tar puppet-ebdad53512ac5e5356c072e8819631ef03893e9f.tar.gz puppet-ebdad53512ac5e5356c072e8819631ef03893e9f.tar.bz2 puppet-ebdad53512ac5e5356c072e8819631ef03893e9f.tar.xz puppet-ebdad53512ac5e5356c072e8819631ef03893e9f.zip | |
buildsystem::distros: add 'no_mirror' option
For distributions that are not mirrored (like infra_*).
Diffstat (limited to 'modules/buildsystem/templates')
| -rw-r--r-- | modules/buildsystem/templates/vhost_repository.conf | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/modules/buildsystem/templates/vhost_repository.conf b/modules/buildsystem/templates/vhost_repository.conf index 6b5b67e5..39c4c689 100644 --- a/modules/buildsystem/templates/vhost_repository.conf +++ b/modules/buildsystem/templates/vhost_repository.conf @@ -2,6 +2,7 @@ mirror_root = scope.lookupvar('buildsystem::var::repository::mirror_root') mirror_reporoot = scope.lookupvar('buildsystem::var::repository::mirror_reporoot') bootstrap_reporoot = scope.lookupvar('buildsystem::var::repository::bootstrap_reporoot') +distribdir = scope.lookupvar('buildsystem::var::repository::distribdir') distros = scope.lookupvar('buildsystem::var::distros::distros') -%> <VirtualHost *:80> @@ -14,6 +15,10 @@ distros = scope.lookupvar('buildsystem::var::distros::distros') %> Alias /bootstrap/<%= distroname %>/ "<%= bootstrap_reporoot %>/<%= distroname %>/" +<%- if distro['no_mirror'] -%> + Alias /<%= distribdir %>/<%= distroname %>/ "<%= bootstrap_reporoot %>/<%= distroname %>/" +<%- end -%> + <Directory <%= bootstrap_reporoot %>/<%= distroname %>> Header append Cache-Control "public, must-revalidate" Order deny,allow |