From: Tom Hughes <tom@compton.nu>
Date: Thu, 18 Feb 2016 08:51:08 +0000 (+0000)
Subject: Merge remote-tracking branch 'github/pull/56'
X-Git-Url: https://git.openstreetmap.org/chef.git/commitdiff_plain/c8372fbc6df23a6a014341d453c48532b78fedbd?hp=650d2449041e1e3a14845bf2c33e71172bae5d0f

Merge remote-tracking branch 'github/pull/56'
---

diff --git a/cookbooks/tilecache/templates/default/logrotate.squid.erb b/cookbooks/tilecache/templates/default/logrotate.squid.erb
index 6ce392c1d..e6bfbc688 100644
--- a/cookbooks/tilecache/templates/default/logrotate.squid.erb
+++ b/cookbooks/tilecache/templates/default/logrotate.squid.erb
@@ -12,6 +12,6 @@
   sharedscripts
   postrotate
     test ! -e /var/run/squid.pid || /usr/sbin/squid -k rotate
-    /usr/bin/rsync /var/log/squid/zere.log.2.xz ironbelly::logs/tile.openstreetmap.org/<%= node[:hostname] %>-`date -d "-2 days" +%Y-%m-%d`.xz || true
+    /usr/bin/rsync /var/log/squid/zere.log.1.xz ironbelly::logs/tile.openstreetmap.org/<%= node[:hostname] %>-`date -d "-1 days" +%Y-%m-%d`.xz || true
   endscript
 }
diff --git a/cookbooks/tilelog/templates/default/tilelog.erb b/cookbooks/tilelog/templates/default/tilelog.erb
index 1d9c8b468..598c1e127 100644
--- a/cookbooks/tilelog/templates/default/tilelog.erb
+++ b/cookbooks/tilelog/templates/default/tilelog.erb
@@ -4,7 +4,7 @@ ANALYZE=<%= @analyze_bin %>
 LOGDIR=<%= @input_dir %>
 OUTDIR=<%= @output_dir %>
 if [ -z "$DATE" ]; then
-		DATE=`date -d "2 days ago" "+%Y-%m-%d"`
+		DATE=`date -d "1 day ago" "+%Y-%m-%d"`
 fi
 TMPDIR=`mktemp -d -t tmp.XXXXXXXXX`
 ORIGDIR=`pwd`