X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Froles%2Ftemplates%2Fstatic-mirroring%2Fvhost%2Fplanet.debian.org.erb;h=7d0ab0159ebdf998db8ccb865d4cf475f75af1fe;hb=7cf8b7eb558549cc7c5ff4c7c6e8356d91b91077;hp=98806c513eac1bec693f51fa1e2ce4d59783487b;hpb=250b44d39b2a25ab5785374b4fcb3c2afa07ad23;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 98806c513..7d0ab0159 100644
--- a/modules/roles/templates/static-mirroring/vhost/planet.debian.org.erb
+++ b/modules/roles/templates/static-mirroring/vhost/planet.debian.org.erb
@@ -1,6 +1,11 @@
+<% if scope.function_has_static_component(['planet.debian.org']) -%>
+
 <Virtualhost <%= vhost_listen %> >
 	ServerName planet.debian.org
-	ServerAlias planet.debian.net planeta.debian.net
+	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
@@ -10,8 +15,11 @@
 		UserDir disabled
 	</IfModule>
 
-	DocumentRoot /srv/static.debian.org/cur/planet.debian.org
+	DocumentRoot /srv/static.debian.org/mirrors/planet.debian.org/cur
 	AddDefaultCharset utf-8
+	<Directory /srv/static.debian.org/mirrors/planet.debian.org/cur>
+		Require all granted
+	</Directory>
 
 	RewriteEngine On
 	RewriteCond %{HTTP_HOST} ^planeta.debian.net$ [NC]
@@ -19,4 +27,6 @@
 	RewriteCond %{HTTP_HOST} ^planet.debian.net$ [NC]
 	RewriteRule ^/(.*)        http://planet.debian.org/$1  [R=permanent,L]
 </VirtualHost>
+<% end -%>
+
 # vim:set syn=apache: