Different log rules for http vs. https

diff --git a/modules/roles/templates/apache-www.debian.org.erb b/modules/roles/templates/apache-www.debian.org.erb
index ff7ca6137b0ab9bed2cdc1b245a15e2a274d2751..7a2863b5a98411d289423da87f6ae5148c8b1eef 100644 (file)
--- a/modules/roles/templates/apache-www.debian.org.erb
+++ b/modules/roles/templates/apache-www.debian.org.erb
@@ -148,8 +148,6 @@
    ServerAdmin webmaster@debian.org
    ServerAlias www-*.debian.org
    DocumentRoot <%= wwwdo_document_root %>/
-   ErrorLog /var/log/apache2/www.debian.org-error.log
-   CustomLog /var/log/apache2/www.debian.org-access.log privacy
 
    # CacheNegotiatedDocs: By default, Apache sends Pragma: no-cache with each
    # document that was negotiated on the basis of content. This asks proxy
@@ -266,9 +264,15 @@
 
 
 <VirtualHost <%= vhost_listen %> >
+   ErrorLog /var/log/apache2/www.debian.org-error.log
+   CustomLog /var/log/apache2/www.debian.org-access.log privacy
+
    Use common-www.d.o
 </VirtualHost>
 <VirtualHost <%= vhost_listen_443 %> >
+   ErrorLog /var/log/apache2/www.debian.org-error.log
+   CustomLog /var/log/apache2/www.debian.org-access.log privacyssl
+
    Use common-www.d.o
 
    Use common-debian-service-ssl www.debian.org
@@ -285,6 +289,7 @@
 
    Redirect permanent / https://www.debian.org/
 
+
    Use common-debian-service-ssl www.debian.org
    Use common-ssl-HSTS
 </VirtualHost>