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 6ce392c1d49da9919dd361951ad7b208894b9464..e6bfbc688a0c851c70986db62a3a0d20f060464b 100644 (file)
--- 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 1d9c8b4680216860cb2643a893cfebdb4b16e53f..598c1e127770eaadafcde00f3c3e69227c06db8a 100644 (file)
--- 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`