X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;ds=sidebyside;f=modules%2Froles%2Ftemplates%2Fstatic-mirroring%2Fstatic-vhost.conf.erb;h=9b76aef63b40ade0fa4d8fa4d4a3b6629ab068fc;hb=52ab75241aa59786d9cf7af14dc99c8ee1641483;hp=4b8640cee89bfab416d4796191c27e00db9c0a36;hpb=4433aee9a7832e8e64c93de3b9f5370519ebc221;p=mirror%2Fdsa-puppet.git
diff --git a/modules/roles/templates/static-mirroring/static-vhost.conf.erb b/modules/roles/templates/static-mirroring/static-vhost.conf.erb
index 4b8640cee..9b76aef63 100644
--- a/modules/roles/templates/static-mirroring/static-vhost.conf.erb
+++ b/modules/roles/templates/static-mirroring/static-vhost.conf.erb
@@ -6,20 +6,20 @@
ServerSignature On
- DocumentRoot /srv/static.debian.org/cur/$name/
-
- AllowOverride FileInfo
- Options Multiviews Indexes FollowSymLinks
+ DocumentRoot /srv/static.debian.org/mirrors/$name/cur
+
+ AllowOverride FileInfo Indexes Options=Multiviews
IndexOptions FancyIndexing NameWidth=*
Order allow,deny
Allow from all
+ DefaultType text/plain
AddOutputFilterByType DEFLATE text/html text/plain text/xml text/css
-
+
>
ServerName $name
ServerAdmin debian-admin@lists.debian.org
@@ -28,6 +28,7 @@
CustomLog /var/log/apache2/$name-access.log privacy
Use common-static-base $name
+ $extra
@@ -46,5 +47,34 @@
+
+ Use common-static-vhost-with-extra $name "# nada"
+
+
+
+
+ >
+ ServerName $name
+ ServerAdmin debian-admin@lists.debian.org
+
+ CustomLog /var/log/apache2/$name-access.log privacy
+ ErrorLog /var/log/apache2/$name-error.log
+
+ Redirect permanent / https://$name/
+
+
+ >
+ ServerName $name
+ ServerAdmin debian-admin@lists.debian.org
+
+ ErrorLog /var/log/apache2/$name-error.log
+ CustomLog /var/log/apache2/$name-access.log privacy
+
+ Use common-debian-service-ssl $name
+ Use common-ssl-HSTS
+
+ Use common-static-base $name
+
+
# vim:ft=apache: