Distinguish ssl/nossl access logs for planet-backend

[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 20f9298..1dd2353 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,12 +1,9 @@
 <% if scope.function_has_static_component(['planet.debian.org']) -%>
 
-<Virtualhost <%= vhost_listen %> >
-       ServerName planet.debian.org
-       ServerAlias planet.debian.net planeta.debian.net planet-backend.debian.org planet-fastly.debian.org planet-maxcdn.debian.org
+<Macro common-planet.d.o>
        ServerAdmin planet@debian.org
 
        ErrorLog /var/log/apache2/planet.debian.org-error.log
-       CustomLog /var/log/apache2/planet.debian.org-access.log privacy
 
        <IfModule mod_userdir.c>
                UserDir disabled
@@ -14,11 +11,20 @@
 
        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 -%>
+       <Directory /srv/static.debian.org/mirrors/planet.debian.org/cur>
+               Require all granted
+       </Directory>
+</Macro>
+
+<Virtualhost <%= @vhost_listen %> >
+       ServerName planet.debian.org
+       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 %>
+
+       CustomLog /var/log/apache2/planet.debian.org-access.log privacy
+       Use common-planet.d.o
 
        RewriteEngine On
        RewriteCond %{HTTP_HOST} ^planeta.debian.net$ [NC]
@@ -26,6 +32,16 @@
        RewriteCond %{HTTP_HOST} ^planet.debian.net$ [NC]
        RewriteRule ^/(.*)        http://planet.debian.org/$1  [R=permanent,L]
 </VirtualHost>
+
+<VirtualHost <%= @vhost_listen_443 %> >
+       ServerName planet-backend.debian.org
+
+       CustomLog /var/log/apache2/planet.debian.org-access.log privacyssl
+       Use common-debian-service-ssl planet-backend.debian.org
+       Use common-planet.d.o
+
+</VirtualHost>
+
 <% end -%>
 
 # vim:set syn=apache: