aboutsummaryrefslogtreecommitdiffstats
path: root/modules/buildsystem/templates/vhost_repository.conf
diff options
context:
space:
mode:
authorPascal Terjan <pterjan@mageia.org>2012-02-13 23:21:07 +0000
committerPascal Terjan <pterjan@mageia.org>2012-02-13 23:21:07 +0000
commit0eee8e42dec259eba7e9ea04acbcf07ba5fb957b (patch)
treed1b0285781de51c4438193c942f181f885ba77d6 /modules/buildsystem/templates/vhost_repository.conf
parentb3d412bf4e308d9c90654c0ded7a69377d454471 (diff)
downloadpuppet-0eee8e42dec259eba7e9ea04acbcf07ba5fb957b.tar
puppet-0eee8e42dec259eba7e9ea04acbcf07ba5fb957b.tar.gz
puppet-0eee8e42dec259eba7e9ea04acbcf07ba5fb957b.tar.bz2
puppet-0eee8e42dec259eba7e9ea04acbcf07ba5fb957b.tar.xz
puppet-0eee8e42dec259eba7e9ea04acbcf07ba5fb957b.zip
Make infra_1 accessible on build nodes even if it is not in mirror
Diffstat (limited to 'modules/buildsystem/templates/vhost_repository.conf')
-rw-r--r--modules/buildsystem/templates/vhost_repository.conf9
1 files changed, 9 insertions, 0 deletions
diff --git a/modules/buildsystem/templates/vhost_repository.conf b/modules/buildsystem/templates/vhost_repository.conf
index a8e9c9e5..f49243e2 100644
--- a/modules/buildsystem/templates/vhost_repository.conf
+++ b/modules/buildsystem/templates/vhost_repository.conf
@@ -7,6 +7,7 @@ buildsystem_nodes = "2a02:2178:2:7::3/64 2a02:2178:2:7::4/64 2a02:2178:2:7::5/64
<VirtualHost *:80>
ServerName repository.<%= domain %>
DocumentRoot <%= mirror_root %>
+ Alias /distrib/infra_1/ "/distrib/bootstrap/distrib/infra_1/"
Alias /mandriva/ "/distrib/mandriva/"
Alias /mageiatools/ "/distrib/mageiatools/"
<Directory <%= mirror_root %>>
@@ -17,6 +18,14 @@ buildsystem_nodes = "2a02:2178:2:7::3/64 2a02:2178:2:7::4/64 2a02:2178:2:7::5/64
Allow from .<%= domain %>
Options Indexes FollowSymLinks
</Directory>
+ <Directory /distrib/bootstrap/distrib/infra_1>
+ Order deny,allow
+ Deny from all
+ Allow from localhost, 127.0.0.1
+ Allow from <%= buildsystem_nodes %>
+ Allow from .<%= domain %>
+ Options Indexes FollowSymLinks
+ </Directory>
<Directory /distrib/mandriva>
Order deny,allow
Deny from all