From: Peter Palfrader <peter@palfrader.org>
Date: Fri, 29 Jul 2016 17:15:21 +0000 (+0000)
Subject: add planet.d.o onionbalance and web
X-Git-Url: https://git.adam-barratt.org.uk/?a=commitdiff_plain;h=bff0869ff84e1f232aa17385eb0b94240bf9117e;p=mirror%2Fdsa-puppet.git

add planet.d.o onionbalance and web
---

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 @@
 <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