From: Julien Cristau <jcristau@debian.org>
Date: Fri, 10 Nov 2017 23:03:32 +0000 (+0100)
Subject: Distinguish ssl/nossl access logs for planet-backend
X-Git-Url: https://git.adam-barratt.org.uk/?a=commitdiff_plain;h=1f84593290b93ad37e6dcdb567c3e4fefa7958a2;p=mirror%2Fdsa-puppet.git

Distinguish ssl/nossl access logs for planet-backend
---

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 1f45252bf..1dd23536f 100644
--- a/modules/roles/templates/static-mirroring/vhost/planet.debian.org.erb
+++ b/modules/roles/templates/static-mirroring/vhost/planet.debian.org.erb
@@ -4,7 +4,6 @@
 	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
@@ -24,6 +23,7 @@
 	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
@@ -36,6 +36,7 @@
 <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