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=8227165a9fb86f64e11c6fb46bde3878fde08ee0;hp=9b76aef63b40ade0fa4d8fa4d4a3b6629ab068fc;hpb=52ab75241aa59786d9cf7af14dc99c8ee1641483;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 9b76aef63..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/
+
+
@@ -14,6 +37,8 @@
Allow from all
+ Header set Surrogate-Key <%= hostname %>
+
DefaultType text/plain
AddOutputFilterByType DEFLATE text/html text/plain text/xml text/css
@@ -32,43 +57,20 @@
-
- >
- 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
-
-
- Use common-static-base $name
-
-
-
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/
-
+ 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-access.log privacyssl
Use common-debian-service-ssl $name
Use common-ssl-HSTS