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=8e0b642200f3c3af4e9ad7a0eaab1713baea9123;hp=6b857fc60a474bc2cacccd4d3f276c843bc1cd7d;hpb=a246c719342267cb573840f29fb9f647f2b7f857;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 6b857fc60..c2d225289 100644
--- a/modules/roles/templates/static-mirroring/static-vhost.conf.erb
+++ b/modules/roles/templates/static-mirroring/static-vhost.conf.erb
@@ -34,12 +34,7 @@
 		AllowOverride FileInfo Indexes Options=Multiviews
 		Options Indexes SymLinksIfOwnerMatch
 		IndexOptions FancyIndexing NameWidth=*
-		<% if @lsbmajdistrelease > '7' -%>
-			Require all granted
-		<% else -%>
-			Order allow,deny
-			Allow from all
-		<% end -%>
+		Require all granted
 	</Directory>
 
 	Header set Surrogate-Key <%= hostname %>
@@ -48,25 +43,33 @@
 </Macro>
 
 
-<Macro common-static-vhost-with-extra $name $extra>
+
+
+<Macro common-static-vhost-with-extra $name $onion>
 	<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
-		$extra
+		Use vhost-$name-extra
 	</VirtualHost>
 </Macro>
 
-<Macro common-static-vhost $name>
-	Use common-static-vhost-with-extra $name "# nada"
+<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 common-static-vhost-ssl $name>
+<Macro common-static-vhost-ssl $name $onion>
 	Use common-dsa-vhost-https-redirect $name
 
 	<Virtualhost <%= vhost_listen_443 %> >
@@ -81,6 +84,16 @@
 
 		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
+	</VirtualHost>
 </Macro>
 
 # vim:ft=apache: