Use logformat privacy

diff --git a/modules/apache2/templates/default-debian.org.erb b/modules/apache2/templates/default-debian.org.erb
index 131f021..9f40d2a 100644 (file)
--- a/modules/apache2/templates/default-debian.org.erb
+++ b/modules/apache2/templates/default-debian.org.erb
@@ -7,7 +7,7 @@
        ServerAdmin debian-admin@debian.org
 
        ErrorLog /var/log/apache2/error.log
-       CustomLog /var/log/apache2/access.log combined
+       CustomLog /var/log/apache2/access.log privacy
 
        DocumentRoot /srv/www/default.debian.org/htdocs
 

diff --git a/modules/roles/files/backports_mirror/backports.debian.org b/modules/roles/files/backports_mirror/backports.debian.org
index 73966cf..90a7ebd 100644 (file)
--- a/modules/roles/files/backports_mirror/backports.debian.org
+++ b/modules/roles/files/backports_mirror/backports.debian.org
@@ -8,7 +8,7 @@
        ServerAdmin debian-admin@debian.org
 
        ErrorLog /var/log/apache2/backports.debian.org-error.log
-       CustomLog /var/log/apache2/backports.debian.org-access.log combined
+       CustomLog /var/log/apache2/backports.debian.org-access.log privacy
 
        <IfModule mod_userdir.c>
                UserDir disabled

diff --git a/modules/roles/files/backports_mirror/www.backports.org b/modules/roles/files/backports_mirror/www.backports.org
index 7bcade2..96609e1 100644 (file)
--- a/modules/roles/files/backports_mirror/www.backports.org
+++ b/modules/roles/files/backports_mirror/www.backports.org
@@ -13,7 +13,7 @@
        ServerAdmin debian-admin@debian.org
 
        ErrorLog /var/log/apache2/www.backports.org-error.log
-       CustomLog /var/log/apache2/www.backports.org-access.log combined
+       CustomLog /var/log/apache2/www.backports.org-access.log privacy
 
        <IfModule mod_userdir.c>
                UserDir disabled

diff --git a/modules/roles/files/bugs_mirror/bugs-mirror.debian.org b/modules/roles/files/bugs_mirror/bugs-mirror.debian.org
index 10ff4ef..42b3ae9 100644 (file)
--- a/modules/roles/files/bugs_mirror/bugs-mirror.debian.org
+++ b/modules/roles/files/bugs_mirror/bugs-mirror.debian.org
@@ -10,7 +10,7 @@
        ServerAdmin debian-admin@debian.org
 
        ErrorLog /var/log/apache2/bugs-mirror.debian.org-error.log
-       CustomLog /var/log/apache2/bugs-mirror.debian.org-access.log combined
+       CustomLog /var/log/apache2/bugs-mirror.debian.org-access.log privacy
 
        <IfModule mod_userdir.c>
                UserDir disabled

diff --git a/modules/roles/files/ftp-upcoming_mirror/ftp-upcoming.debian.org b/modules/roles/files/ftp-upcoming_mirror/ftp-upcoming.debian.org
index 24e6fa0..0849ad1 100644 (file)
--- a/modules/roles/files/ftp-upcoming_mirror/ftp-upcoming.debian.org
+++ b/modules/roles/files/ftp-upcoming_mirror/ftp-upcoming.debian.org
@@ -10,7 +10,7 @@
 
    ErrorLog /var/log/apache2/ftp-upcoming.debian.org-error.log
    LogLevel warn
-   CustomLog /var/log/apache2/ftp-upcoming.debian.org-access.log combined
+   CustomLog /var/log/apache2/ftp-upcoming.debian.org-access.log privacy
 
    IndexOptions FancyIndexing NameWidth=*
 </VirtualHost>

diff --git a/modules/roles/files/security_mirror/security.debian.org b/modules/roles/files/security_mirror/security.debian.org
index 0f77652..28ec653 100644 (file)
--- a/modules/roles/files/security_mirror/security.debian.org
+++ b/modules/roles/files/security_mirror/security.debian.org
@@ -31,7 +31,7 @@
    # alert, emerg.
    LogLevel warn
 
-   CustomLog /var/log/apache2/security.debian.org-access.log combined
+   CustomLog /var/log/apache2/security.debian.org-access.log privacy
    ServerSignature On
 
 </VirtualHost>

diff --git a/modules/roles/templates/static-mirroring/static-vhost.conf.erb b/modules/roles/templates/static-mirroring/static-vhost.conf.erb
index ea0d2ac..7cd9939 100644 (file)
--- a/modules/roles/templates/static-mirroring/static-vhost.conf.erb
+++ b/modules/roles/templates/static-mirroring/static-vhost.conf.erb
@@ -23,9 +23,8 @@
        ServerName $name
        ServerAdmin debian-admin@lists.debian.org
 
-
        ErrorLog /var/log/apache2/$name-error.log
-       CustomLog /var/log/apache2/$name-access.log combined
+       CustomLog /var/log/apache2/$name-access.log privacy
 
        Use common-$name
 </VirtualHost>

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 d814211..98806c5 100644 (file)
--- 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,7 @@
        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