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=9a3e83c1925c72a8ac88fdcce9cee31c2fd7e94f;hb=f4a8a766c3bd060ea9b2c8c8c75ae052b89df4b9;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..9a3e83c19 100644
--- a/modules/roles/templates/static-mirroring/static-vhost.conf.erb
+++ b/modules/roles/templates/static-mirroring/static-vhost.conf.erb
@@ -1,6 +1,20 @@
# 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/
+
+
+
+
+
+ ServerAdmin debian-admin@lists.debian.org
-
UserDir disabled
@@ -9,72 +23,53 @@
DocumentRoot /srv/static.debian.org/mirrors/$name/cur
AllowOverride FileInfo Indexes Options=Multiviews
- IndexOptions FancyIndexing NameWidth=*
- Order allow,deny
- Allow from all
+ Options Indexes SymLinksIfOwnerMatch
+ Require all granted
- DefaultType text/plain
+ Header set Surrogate-Key <%= @hostname %>
+
AddOutputFilterByType DEFLATE text/html text/plain text/xml text/css
-
+ Use vstatic-vhost-extra-$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-static-base $name
- $extra
+ Use static-vhost-base-$name
-
- >
- ServerName $name
- ServerAdmin debian-admin@lists.debian.org
+
+ >
+ ServerName $onion
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 static-vhost-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/
-
-
- >
- 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
+ Use http-pkp-$name
- Use common-static-base $name
+ Use static-vhost-base-$name
+
# vim:ft=apache: