X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Froles%2Ftemplates%2Fstatic-mirroring%2Fstatic-vhost.conf.erb;h=c2d22528998231c40ac9268e42f948e82bc318e8;hb=1914af73e5e8f62c3058ac19135802a7777acbb6;hp=5e3fe41db0fd37ec18383cd078bec745597ab7ae;hpb=06db43bd308fe7bb359f200149ed173985fc0232;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 5e3fe41db..c2d225289 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/
+
+
@@ -9,55 +32,66 @@
DocumentRoot /srv/static.debian.org/mirrors/$name/cur
AllowOverride FileInfo Indexes Options=Multiviews
+ Options Indexes SymLinksIfOwnerMatch
IndexOptions FancyIndexing NameWidth=*
- Order allow,deny
- Allow from all
+ Require all granted
- DefaultType text/plain
+ Header set Surrogate-Key <%= hostname %>
+
AddOutputFilterByType DEFLATE text/html text/plain text/xml text/css
-
+
+
+
>
ServerName $name
+ ServerAlias $onion
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 vhost-$name-extra
-
- Use common-static-vhost-with-extra $name "# nada"
+
+
+ # mod macro does not like empty macros, so here's some content:
+
+
+
+ Use common-static-vhost-with-extra $name $onion
-
- >
+
+ Use common-dsa-vhost-https-redirect $name
+
+ >
ServerName $name
ServerAdmin debian-admin@lists.debian.org
- CustomLog /var/log/apache2/$name-access.log privacy
ErrorLog /var/log/apache2/$name-error.log
+ CustomLog /var/log/apache2/$name-access.log privacyssl
- Redirect permanent / https://$name/
+ Use common-debian-service-ssl $name
+ Use common-ssl-HSTS
+
+ Use common-static-base $name
- >
- ServerName $name
+ >
+ ServerName $onion
ServerAdmin debian-admin@lists.debian.org
ErrorLog /var/log/apache2/$name-error.log
CustomLog /var/log/apache2/$name-access.log privacyssl
- Use common-debian-service-ssl $name
- Use common-ssl-HSTS
-
Use common-static-base $name