onions for standard static vhosts

diff --git a/modules/roles/templates/static-mirroring/static-vhost.conf.erb b/modules/roles/templates/static-mirroring/static-vhost.conf.erb
index e041357..c2d2252 100644 (file)
--- 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:

diff --git a/modules/roles/templates/static-mirroring/vhost/static-vhosts-simple.erb b/modules/roles/templates/static-mirroring/vhost/static-vhosts-simple.erb
index 728c345..fe85884 100644 (file)
--- a/modules/roles/templates/static-mirroring/vhost/static-vhosts-simple.erb
+++ b/modules/roles/templates/static-mirroring/vhost/static-vhosts-simple.erb
@@ -22,7 +22,10 @@ def vhost(lines, sn, type=nil)
     t = 'common-static-vhost'
     if type then t += "-#{type}"; end
 
-    lines << "Use #{t} #{sn}"
+    onion = scope.function_onion_global_service_hostname([sn])
+    onion = "unavailable-onion.invalid" if onion.nil?
+
+    lines << "Use #{t} #{sn} #{onion}"
   end
 end