X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Froles%2Ftemplates%2Fstatic-mirroring%2Fstatic-vhost.conf.erb;h=9a3e83c1925c72a8ac88fdcce9cee31c2fd7e94f;hb=ec0a5928c34bafcfd6bb24dbd1d99c4c814ae8ff;hp=c2d22528998231c40ac9268e42f948e82bc318e8;hpb=8e0b642200f3c3af4e9ad7a0eaab1713baea9123;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 c2d225289..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,6 @@
 # puppet maintained
 <Macro common-dsa-vhost-https-redirect $name>
-	<VirtualHost <%= vhost_listen %> >
+	<VirtualHost <%= @vhost_listen %> >
 		ServerName $name
 		ServerAdmin debian-admin@lists.debian.org
 
@@ -11,19 +11,10 @@
 	</VirtualHost>
 </Macro>
 
-<Macro common-dsa-vhost-https-redirect-temp $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 / 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>
@@ -33,67 +24,52 @@
 	<Directory /srv/static.debian.org/mirrors/$name/cur>
 		AllowOverride FileInfo Indexes Options=Multiviews
 		Options Indexes SymLinksIfOwnerMatch
-		IndexOptions FancyIndexing NameWidth=*
 		Require all granted
 	</Directory>
 
-	Header set Surrogate-Key <%= hostname %>
+	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 $onion>
-	<Virtualhost <%= vhost_listen %> >
+<Macro static-vhost-plain-$name>
+	<VirtualHost <%= @vhost_listen %>>
 		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
-		Use vhost-$name-extra
+		Use static-vhost-base-$name
 	</VirtualHost>
 </Macro>
 
-<Macro common-static-vhost $name $onion>
-	<Macro vhost-$name-extra>
-		# mod macro does not like empty macros, so here's some content:
-		<Directory /non-existant>
-		</Directory>
-	</Macro>
-	Use common-static-vhost-with-extra $name $onion
-</Macro>
+<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
 
-<Macro common-static-vhost-ssl $name $onion>
-	Use common-dsa-vhost-https-redirect $name
+		Use static-vhost-base-$name
+	</VirtualHost>
+</Macro>
 
-	<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 privacyssl
 
 		Use common-debian-service-ssl $name
 		Use common-ssl-HSTS
+		Use http-pkp-$name
 
-		Use common-static-base $name
-	</VirtualHost>
-
-	<Virtualhost <%= vhost_listen %> >
-		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-static-base $name
+		Use static-vhost-base-$name
 	</VirtualHost>
 </Macro>
+</Macro>
 
 # vim:ft=apache: