Skip to content

Commit

Permalink
Merge remote-tracking branch 'github/pull/56'
Browse files Browse the repository at this point in the history
  • Loading branch information
tomhughes committed Feb 18, 2016
2 parents 650d244 + 321da3b commit c8372fb
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 2 deletions.
2 changes: 1 addition & 1 deletion cookbooks/tilecache/templates/default/logrotate.squid.erb
Original file line number Diff line number Diff line change
Expand Up @@ -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
}
2 changes: 1 addition & 1 deletion cookbooks/tilelog/templates/default/tilelog.erb
Original file line number Diff line number Diff line change
Expand Up @@ -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`
Expand Down

0 comments on commit c8372fb

Please sign in to comment.