projects
/
mirror
/
dsa-puppet.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Meh
[mirror/dsa-puppet.git]
/
modules
/
roles
/
templates
/
static-mirroring
/
static-vhost.conf.erb
diff --git
a/modules/roles/templates/static-mirroring/static-vhost.conf.erb
b/modules/roles/templates/static-mirroring/static-vhost.conf.erb
index
4b8640c
..
e3aceae
100644
(file)
--- a/
modules/roles/templates/static-mirroring/static-vhost.conf.erb
+++ b/
modules/roles/templates/static-mirroring/static-vhost.conf.erb
@@
-6,20
+6,21
@@
</IfModule>
ServerSignature On
</IfModule>
ServerSignature On
- DocumentRoot /srv/static.debian.org/
cur/$name/
- <Directory /srv/static.debian.org/
cur/$name/
>
- AllowOverride FileInfo
+ DocumentRoot /srv/static.debian.org/
mirrors/$name/cur
+ <Directory /srv/static.debian.org/
mirrors/$name/cur
>
+ AllowOverride FileInfo
Indexes Options=Multiviews
Options Multiviews Indexes FollowSymLinks
IndexOptions FancyIndexing NameWidth=*
Order allow,deny
Allow from all
</Directory>
Options Multiviews Indexes FollowSymLinks
IndexOptions FancyIndexing NameWidth=*
Order allow,deny
Allow from all
</Directory>
+ DefaultType text/plain
AddOutputFilterByType DEFLATE text/html text/plain text/xml text/css
</Macro>
AddOutputFilterByType DEFLATE text/html text/plain text/xml text/css
</Macro>
-<Macro common-static-vhost
$name
>
+<Macro common-static-vhost
-with-extra $name $extra
>
<Virtualhost <%= vhost_listen %> >
ServerName $name
ServerAdmin debian-admin@lists.debian.org
<Virtualhost <%= vhost_listen %> >
ServerName $name
ServerAdmin debian-admin@lists.debian.org
@@
-28,6
+29,7
@@
CustomLog /var/log/apache2/$name-access.log privacy
Use common-static-base $name
CustomLog /var/log/apache2/$name-access.log privacy
Use common-static-base $name
+ $extra
</VirtualHost>
</Macro>
</VirtualHost>
</Macro>
@@
-46,5
+48,9
@@
</VirtualHost>
</Macro>
</VirtualHost>
</Macro>
+<Macro common-static-vhost $name>
+ Use common-static-vhost-with-extra $name "# nada"
+</Macro>
+
# vim:ft=apache:
# vim:ft=apache: