X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Froles%2Ftemplates%2Fstatic-mirroring%2Fstatic-vhost.conf.erb;h=26108117a3525f7dbd9757c8feb90d02801514dd;hb=7997b09aa6fcd6bb60ed9b82b1bce4247589a187;hp=d9b636706d3c782c3d4f0f9482763549da209ae9;hpb=f5006b286bd853a4224347c39898b09ce990904f;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 d9b636706..26108117a 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
+<Macro common-dsa-vhost-https-redirect $name>
+	<VirtualHost <%= vhost_listen %> >
+		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/
+	</VirtualHost>
+</Macro>
+
+<Macro prepare-static-vhost $name>
+<Macro static-vhost-base-$name>
+	ServerAdmin debian-admin@lists.debian.org
 
-<Macro common-static-base $name>
 	<IfModule mod_userdir.c>
 		UserDir disabled
 	</IfModule>
@@ -9,64 +23,53 @@
 	DocumentRoot /srv/static.debian.org/mirrors/$name/cur
 	<Directory /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
 	</Directory>
 
-	DefaultType text/plain
+	Header set Surrogate-Key <%= hostname %>
+
 	AddOutputFilterByType DEFLATE text/html text/plain text/xml text/css
-</Macro>
 
+	Use vstatic-vhost-extra-$name
+</Macro>
 
-<Macro common-static-vhost-with-extra $name $extra>
-	<Virtualhost <%= vhost_listen %> >
+<Macro static-vhost-plain-$name>
+	<VirtualHost <%= vhost_listen %>>
 		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
 	</VirtualHost>
 </Macro>
 
-<Macro common-static-vhost-publiclog $name>
-	<Virtualhost <%= vhost_listen %> >
-		ServerName $name
-		ServerAdmin debian-admin@lists.debian.org
+<Macro static-vhost-onion-$name $onion>
+	<VirtualHost <%= vhost_listen %>>
+		ServerName $onion
 
 		ErrorLog /var/log/apache2/$name-error.log
 		CustomLog /var/log/apache2/$name-access.log privacy
-		<IfModule mod_geoip.c>
-			CustomLog /var/log/apache2/$name-public-access.log privacy+geo
-		</IfModule>
 
-		Use common-static-base $name
+		Use static-vhost-base-$name
 	</VirtualHost>
 </Macro>
 
-<Macro common-static-vhost $name>
-	Use common-static-vhost-with-extra $name "# nada"
-</Macro>
-
-
-<Macro common-static-vhost-ssl $name>
-	Use common-debian-service-https-redirect <%= vhost_listen %> $name
-
-	<Virtualhost <%= vhost_listen %>:443 >
+<Macro static-vhost-ssl-$name>
+	<VirtualHost <%= vhost_listen_443 %>>
 		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 common-static-base $name
+		Use static-vhost-base-$name
 	</VirtualHost>
 </Macro>
+</Macro>
 
 # vim:ft=apache: