X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Froles%2Ftemplates%2Fstatic-mirroring%2Fstatic-vhost.conf.erb;fp=modules%2Froles%2Ftemplates%2Fstatic-mirroring%2Fstatic-vhost.conf.erb;h=c2d22528998231c40ac9268e42f948e82bc318e8;hb=8e0b642200f3c3af4e9ad7a0eaab1713baea9123;hp=e0413572c3a2f605f516618c1504f1d29a4c142b;hpb=4c7d4bae08c818fbd0cbf3a05bfa8870189f72b3;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 e0413572c..c2d225289 100644
--- a/modules/roles/templates/static-mirroring/static-vhost.conf.erb
+++ b/modules/roles/templates/static-mirroring/static-vhost.conf.erb
@@ -43,9 +43,12 @@
 </Macro>
 
 
-<Macro common-static-vhost-with-extra $name>
+
+
+<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
@@ -56,17 +59,17 @@
 	</VirtualHost>
 </Macro>
 
-<Macro common-static-vhost $name>
+<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
+	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: