X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;ds=sidebyside;f=modules%2Froles%2Ftemplates%2Fstatic-mirroring%2Fvhost%2Fplanet.debian.org.erb;h=9dca69c6eea6c0df1f7ccf14da662e25a584e433;hb=140e86b64590b93b769c2ae8b4355c3a6e55d728;hp=20f9298a6c4781a76b401d00dd06ad98893d6ed7;hpb=26bc980392c5213fd04962602529c04493f8dcb7;p=mirror%2Fdsa-puppet.git

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 20f9298a6..9dca69c6e 100644
--- a/modules/roles/templates/static-mirroring/vhost/planet.debian.org.erb
+++ b/modules/roles/templates/static-mirroring/vhost/planet.debian.org.erb
@@ -1,8 +1,11 @@
 <% if scope.function_has_static_component(['planet.debian.org']) -%>
 
-<Virtualhost <%= vhost_listen %> >
+<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
@@ -14,11 +17,9 @@
 
 	DocumentRoot /srv/static.debian.org/mirrors/planet.debian.org/cur
 	AddDefaultCharset utf-8
-	<% if @lsbmajdistrelease > '7' -%>
-		<Directory /srv/static.debian.org/mirrors/planet.debian.org/cur>
-			Require all granted
-		</Directory>
-	<% end -%>
+	<Directory /srv/static.debian.org/mirrors/planet.debian.org/cur>
+		Require all granted
+	</Directory>
 
 	RewriteEngine On
 	RewriteCond %{HTTP_HOST} ^planeta.debian.net$ [NC]