X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Froles%2Ftemplates%2Fstatic-mirroring%2Fstatic-vhost.conf.erb;h=b2650744f6c2bb5f8aa65fb3124f4c3ff07910ae;hb=8761921fdf2e73d66bbf4438f2f1e33f30b544ef;hp=d171ff6ad712cbbce0b6fa15c7843de7f711a58d;hpb=fd943a80b169a74082d200cd45edb8216fafc29e;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 d171ff6ad..b2650744f 100644
--- a/modules/roles/templates/static-mirroring/static-vhost.conf.erb
+++ b/modules/roles/templates/static-mirroring/static-vhost.conf.erb
@@ -1,4 +1,27 @@
# puppet maintained
+
+ >
+ 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
+
+ CustomLog /var/log/apache2/$name-access.log privacy
+ ErrorLog /var/log/apache2/$name-error.log
+
+ Redirect / https://$name/
+
+
@@ -8,13 +31,14 @@
DocumentRoot /srv/static.debian.org/mirrors/$name/cur
- AllowOverride FileInfo
- Options Multiviews Indexes FollowSymLinks
+ AllowOverride FileInfo Indexes Options=Multiviews
IndexOptions FancyIndexing NameWidth=*
Order allow,deny
Allow from all
+ Header set Surrogate-Key <%= hostname %>
+
DefaultType text/plain
AddOutputFilterByType DEFLATE text/html text/plain text/xml text/css
@@ -30,29 +54,29 @@
Use common-static-base $name
$extra
- DefaultType text/plain
-
- >
+
+ Use common-static-vhost-with-extra $name "# nada"
+
+
+
+
+ Use common-dsa-vhost-https-redirect $name
+
+ >
ServerName $name
ServerAdmin debian-admin@lists.debian.org
ErrorLog /var/log/apache2/$name-error.log
- CustomLog /var/log/apache2/$name-access.log privacy
-
- CustomLog /var/log/apache2/$name-public-access.log privacy+geo
-
+ CustomLog /var/log/apache2/$name-access.log privacyssl
+
+ Use common-debian-service-ssl $name
+ Use common-ssl-HSTS
Use common-static-base $name
- DefaultType text/plain
-
- Use common-static-vhost-with-extra $name "# nada"
-
-
-
# vim:ft=apache: