From bff0869ff84e1f232aa17385eb0b94240bf9117e Mon Sep 17 00:00:00 2001 From: Peter Palfrader Date: Fri, 29 Jul 2016 17:15:21 +0000 Subject: [PATCH] add planet.d.o onionbalance and web --- modules/roles/manifests/onionbalance.pp | 3 +++ .../templates/static-mirroring/vhost/planet.debian.org.erb | 3 +++ 2 files changed, 6 insertions(+) diff --git a/modules/roles/manifests/onionbalance.pp b/modules/roles/manifests/onionbalance.pp index f36aac7f9..61992464e 100644 --- a/modules/roles/manifests/onionbalance.pp +++ b/modules/roles/manifests/onionbalance.pp @@ -32,4 +32,7 @@ class roles::onionbalance { onion::balance_service { 'es.debconf.org': } onion::balance_service { 'fr.debconf.org': } onion::balance_service { 'miniconf10.debconf.org': } + + # non-SSL + onion::balance_service { 'planet.debian.org': } } diff --git a/modules/roles/templates/static-mirroring/vhost/planet.debian.org.erb b/modules/roles/templates/static-mirroring/vhost/planet.debian.org.erb index 8cecd35e8..7d0ab0159 100644 --- a/modules/roles/templates/static-mirroring/vhost/planet.debian.org.erb +++ b/modules/roles/templates/static-mirroring/vhost/planet.debian.org.erb @@ -3,6 +3,9 @@ > ServerName planet.debian.org ServerAlias planet.debian.net planeta.debian.net planet-backend.debian.org planet-fastly.debian.org planet-maxcdn.debian.org + <% if scope.function_onion_global_service_hostname(['planet.debian.org']) -%> + ServerAlias <%= scope.function_onion_global_service_hostname(['planet.debian.org']) %> + <% end %> ServerAdmin planet@debian.org ErrorLog /var/log/apache2/planet.debian.org-error.log -- 2.20.1