add planet.d.o onionbalance and web

diff --git a/modules/roles/manifests/onionbalance.pp b/modules/roles/manifests/onionbalance.pp
index f36aac7..6199246 100644 (file)
--- 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 8cecd35..7d0ab01 100644 (file)
--- 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 @@
 <Virtualhost <%= vhost_listen %> >
        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