tilecache: remove redundant squid config

[chef.git] / cookbooks / tilecache / templates / default / logrotate.squid.erb

diff --git a/cookbooks/tilecache/templates/default/logrotate.squid.erb b/cookbooks/tilecache/templates/default/logrotate.squid.erb
index 2112b85cde2f631e38679ad42cd1eba2c7852b53..697f0c5c6057a3040a62fda7dce23fff24e24926 100644 (file)
--- a/cookbooks/tilecache/templates/default/logrotate.squid.erb
+++ b/cookbooks/tilecache/templates/default/logrotate.squid.erb
@@ -4,6 +4,7 @@
   daily
   compress
   compresscmd /usr/bin/xz
   daily
   compress
   compresscmd /usr/bin/xz

+  compressoptions --threads=<%= [ node[:cpu][:total] / 2, 1 ].max.ceil %>

   uncompresscmd /usr/bin/unxz
   compressext .xz
   rotate 2
   uncompresscmd /usr/bin/unxz
   compressext .xz
   rotate 2


@@ -14,6 +15,6 @@
     test ! -e /var/run/squid.pid || /usr/sbin/squid -k rotate
   endscript
   lastaction
     test ! -e /var/run/squid.pid || /usr/sbin/squid -k rotate
   endscript
   lastaction

-    /usr/bin/rsync --preallocate /var/log/squid/zere.log.1.xz ironbelly::logs/tile.openstreetmap.org/<%= node[:hostname] %>-`date -d "-1 days" +%Y-%m-%d`.xz || true
+    /usr/bin/rsync --preallocate /var/log/squid/access.log.1.xz ironbelly::logs/tile.openstreetmap.org/<%= node[:hostname] %>-`date -d "-1 days" +%Y-%m-%d`.xz || true

   endscript
 }
   endscript
 }