Add timeline.debian.net to the static CDN

[dsa-puppet.git] / modules / roles / templates / static-mirroring / vhost / planet.debian.org.erb

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 d814211a2978246be3cd3f59332644607c5a3954..758771caed8b0741d43fda8daf31153868bfb6ad 100644 (file)
--- 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]