From: Julien Cristau Date: Tue, 24 Sep 2019 11:32:26 +0000 (+0200) Subject: move the onion address lookup for people.d.o to the template X-Git-Url: https://git.adam-barratt.org.uk/?a=commitdiff_plain;h=3796622f7a39dee1120b7d11500d303451e6ff6a;p=mirror%2Fdsa-puppet.git move the onion address lookup for people.d.o to the template --- diff --git a/modules/roles/manifests/people.pp b/modules/roles/manifests/people.pp index 0ab496987..2e3211b4f 100644 --- a/modules/roles/manifests/people.pp +++ b/modules/roles/manifests/people.pp @@ -20,7 +20,6 @@ class roles::people ( default => enclose_ipv6($listen_addr), } $vhost_listen = $_enclosed_addresses.map |$a| { "${a}:443" } . join(' ') - $onion_hn = onion_tor_service_hostname('people.debian.org') apache2::site { 'people.debian.org': site => 'people.debian.org.conf', content => template('roles/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 831c9dd16..d39525a95 100644 --- 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 +<% if scope.function_onion_global_service_hostname(['people.debian.org']) -%> - ServerName <%= @onion_hn %> + ServerName <%= scope.function_onion_global_service_hostname(['people.debian.org']) %> Use vhost-inner-people.debian.org - +<% end -%>