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=b2650744f6c2bb5f8aa65fb3124f4c3ff07910ae;hb=683aa9d1c4a941f17da0f271b54bd52837481fac;hp=ea0d2acb1b2a817e745c9e6b9b6c9505201b2d60;hpb=927f9ca9bed8928ea91ba1a599857c483ae4994e;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 ea0d2acb1..b2650744f 100644
--- a/modules/roles/templates/static-mirroring/static-vhost.conf.erb
+++ b/modules/roles/templates/static-mirroring/static-vhost.conf.erb
@@ -1,35 +1,82 @@
# 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/
+
+
+
+
UserDir disabled
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
+ Header set Surrogate-Key <%= hostname %>
+
+ DefaultType text/plain
AddOutputFilterByType DEFLATE text/html text/plain text/xml text/css
- >
- ServerName $name
- ServerAdmin debian-admin@lists.debian.org
+
+ >
+ 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-static-base $name
+ $extra
+
+
+
+
+ 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 combined
+ ErrorLog /var/log/apache2/$name-error.log
+ CustomLog /var/log/apache2/$name-access.log privacyssl
- Use common-$name
-
+ Use common-debian-service-ssl $name
+ Use common-ssl-HSTS
+ Use common-static-base $name
+
# vim:ft=apache: