aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Scherer <misc@mageia.org>2012-02-18 18:08:04 +0000
committerMichael Scherer <misc@mageia.org>2012-02-18 18:08:04 +0000
commite0713d9485020069bdfbd1510273b30b52ec2391 (patch)
tree8deb10c1216fc390b3bab68e83b9910af1b83dc6
parentbf9c7c30bf0a8a5e02f831c5f984f7b95972cc0c (diff)
downloadpuppet-e0713d9485020069bdfbd1510273b30b52ec2391.tar
puppet-e0713d9485020069bdfbd1510273b30b52ec2391.tar.gz
puppet-e0713d9485020069bdfbd1510273b30b52ec2391.tar.bz2
puppet-e0713d9485020069bdfbd1510273b30b52ec2391.tar.xz
puppet-e0713d9485020069bdfbd1510273b30b52ec2391.zip
more legible config file ( but could be improved IMHO )
-rw-r--r--modules/buildsystem/templates/vhost_repository.conf11
1 files changed, 8 insertions, 3 deletions
diff --git a/modules/buildsystem/templates/vhost_repository.conf b/modules/buildsystem/templates/vhost_repository.conf
index 74ad3a32..50d42b3b 100644
--- a/modules/buildsystem/templates/vhost_repository.conf
+++ b/modules/buildsystem/templates/vhost_repository.conf
@@ -7,9 +7,10 @@ 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/"
+ Alias /distrib/infra_1/ "/distrib/bootstrap/distrib/infra_1/"
+ Alias /mandriva/ "/distrib/mandriva/"
+ Alias /mageiatools/ "/distrib/mageiatools/"
+
<Directory <%= mirror_root %>>
Order deny,allow
Deny from all
@@ -18,12 +19,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>
Header append Cache-Control "public, must-revalidate"
Order deny,allow
Allow from all
Options Indexes FollowSymLinks
</Directory>
+
<Directory /distrib/mandriva>
Order deny,allow
Deny from all
@@ -32,11 +35,13 @@ 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/mandriva/2010.1-mgaserv/>
Order deny,allow
Allow from all
Options Indexes FollowSymLinks
</Directory>
+
<Directory /distrib/mageiatools>
Order deny,allow
Allow from all