X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Froles%2Ftemplates%2Fstatic-mirroring%2Fvhost%2Fplanet.debian.org.erb;h=20f9298a6c4781a76b401d00dd06ad98893d6ed7;hb=3fa4c08d9e2ac03daa4eef2f51a11b9f3dbb9546;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..20f9298a6 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,8 @@
+<% 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
 	ServerAdmin planet@debian.org
 
 	ErrorLog /var/log/apache2/planet.debian.org-error.log
@@ -10,8 +12,13 @@
 		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
+	<% if @lsbmajdistrelease > '7' -%>
+		<Directory /srv/static.debian.org/mirrors/planet.debian.org/cur>
+			Require all granted
+		</Directory>
+	<% end -%>
 
 	RewriteEngine On
 	RewriteCond %{HTTP_HOST} ^planeta.debian.net$ [NC]
@@ -19,4 +26,6 @@
 	RewriteCond %{HTTP_HOST} ^planet.debian.net$ [NC]
 	RewriteRule ^/(.*)        http://planet.debian.org/$1  [R=permanent,L]
 </VirtualHost>
+<% end -%>
+
 # vim:set syn=apache: