X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Froles%2Ftemplates%2Fstatic-mirroring%2Fvhost%2Fplanet.debian.org.erb;h=758771caed8b0741d43fda8daf31153868bfb6ad;hb=6a94b204599f27a5ec786e03242b594fb51bc7fc;hp=d814211a2978246be3cd3f59332644607c5a3954;hpb=3d61b6c0fcbab717ce99bd5c070ea83983b6bbc5;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 d814211a2..758771cae 100644
--- a/modules/roles/templates/static-mirroring/vhost/planet.debian.org.erb
+++ b/modules/roles/templates/static-mirroring/vhost/planet.debian.org.erb
@@ -1,17 +1,22 @@
 <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
-	CustomLog /var/log/apache2/planet.debian.org-access.log combined
+	CustomLog /var/log/apache2/planet.debian.org-access.log privacy
 
 	<IfModule mod_userdir.c>
 		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]