move the onion address lookup for people.d.o to the template

[mirror/dsa-puppet.git] / modules / roles / templates / apache-people.debian.org.conf.erb

diff --git a/modules/roles/templates/apache-people.debian.org.conf.erb b/modules/roles/templates/apache-people.debian.org.conf.erb
index 831c9dd..d39525a 100644 (file)
--- a/modules/roles/templates/apache-people.debian.org.conf.erb
+++ b/modules/roles/templates/apache-people.debian.org.conf.erb
@@ -38,8 +38,9 @@ Use common-debian-service-https-redirect * people.debian.org
        Use vhost-inner-people.debian.org
 </VirtualHost>
 
+<% if scope.function_onion_global_service_hostname(['people.debian.org']) -%>
 <VirtualHost *:80>
-       ServerName <%= @onion_hn %>
+       ServerName <%= scope.function_onion_global_service_hostname(['people.debian.org']) %>
        Use vhost-inner-people.debian.org
 </VirtualHost>
-
+<% end -%>