ssl for debconf[23]

[mirror/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 98806c5..20f9298 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,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: