Just sync existing www.debian.org access logs instead of duplicating logs

Signed-off-by: Paul Wise <pabs@debian.org>

diff --git a/modules/roles/manifests/weblog_provider.pp b/modules/roles/manifests/weblog_provider.pp
index 202bb8852deac64a1801d8531ae7f5f4e9e27dae..db246210ddfb79ac233cbcd823d1ef911f91cfba 100644 (file)
--- a/modules/roles/manifests/weblog_provider.pp
+++ b/modules/roles/manifests/weblog_provider.pp
@@ -6,7 +6,7 @@ class roles::weblog_provider {
                }
        } else {
                file { '/etc/cron.d/puppet-weblog-provider':
-                       content => "SHELL=/bin/bash\n\n0 */4 * * * weblogsync sleep $((RANDOM \% 1800)); rsync -a --delete-excluded --include '*-public-access.log-*gz' --exclude '**' /var/log/apache2/. weblogsync@wolkenstein.debian.org:-weblogs-incoming-\n",
+                       content => "SHELL=/bin/bash\n\n0 */4 * * * weblogsync sleep $((RANDOM \% 1800)); rsync -a --delete-excluded --include 'www.debian.org-access.log-*gz' --exclude '**' /var/log/apache2/. weblogsync@wolkenstein.debian.org:-weblogs-incoming-\n",
                }
        }
 }

diff --git a/modules/roles/templates/apache-www.debian.org.erb b/modules/roles/templates/apache-www.debian.org.erb
index 566947364ad82650c22cf19a59f81b8292fa889a..157064b0d090da61c93998803c69fd58d3331eef 100644 (file)
--- a/modules/roles/templates/apache-www.debian.org.erb
+++ b/modules/roles/templates/apache-www.debian.org.erb
@@ -282,14 +282,12 @@
 <VirtualHost <%= vhost_listen %> >
    ErrorLog /var/log/apache2/www.debian.org-error.log
    CustomLog /var/log/apache2/www.debian.org-access.log privacy
-   CustomLog /var/log/apache2/www.debian.org-public-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
-   CustomLog /var/log/apache2/www.debian.org-public-access.log privacyssl
 
    Use common-www.d.o