From: Paul Wise Date: Sun, 18 Oct 2015 15:35:48 +0000 (+0800) Subject: Just sync existing www.debian.org access logs instead of duplicating logs X-Git-Url: https://git.adam-barratt.org.uk/?a=commitdiff_plain;h=b8a50b04a53f45a1cbf896a91b74c32e89038da3;p=mirror%2Fdsa-puppet.git Just sync existing debian.org access logs instead of duplicating logs Signed-off-by: Paul Wise --- diff --git a/modules/roles/manifests/weblog_provider.pp b/modules/roles/manifests/weblog_provider.pp index 202bb8852..db246210d 100644 --- 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 566947364..157064b0d 100644 --- a/modules/roles/templates/apache-www.debian.org.erb +++ b/modules/roles/templates/apache-www.debian.org.erb @@ -282,14 +282,12 @@ > 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 > 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