nginx: fix stray output in cleanup script

[chef.git] / cookbooks / nominatim / templates / default / logrotate.nominatim.erb

diff --git a/cookbooks/nominatim/templates/default/logrotate.nominatim.erb b/cookbooks/nominatim/templates/default/logrotate.nominatim.erb
index a8952fe8fb616633374bc7844f3bd5456117d34f..e1fc714162514a83c357b44f8789fc13bc521bcb 100644 (file)
--- a/cookbooks/nominatim/templates/default/logrotate.nominatim.erb
+++ b/cookbooks/nominatim/templates/default/logrotate.nominatim.erb
@@ -1,24 +1,31 @@
 # DO NOT EDIT - This file is being maintained by Chef
 
 # DO NOT EDIT - This file is being maintained by Chef
 

-/var/log/nominatim/update.log {
+<%= node[:nominatim][:logdir] %>/update.log {

   weekly
   missingok
   weekly
   missingok

-  rotate 12
+  rotate 30

   compress
   delaycompress
   notifempty
   create 640 nominatim adm
 }
   compress
   delaycompress
   notifempty
   create 640 nominatim adm
 }

-<% if node[:lsb][:release].to_f < 14.04 -%>

 
 

-/var/log/php5-fpm.log {
+<%= node[:nominatim][:logdir] %>/query.log {

   weekly
   missingok
   weekly
   missingok

-  rotate 3
+  rotate 8

   compress
   delaycompress
   compress
   delaycompress

-  postrotate
-    /usr/bin/service php5-fpm restart > /dev/null
-  endscript
+  notifempty
+  create 640 www-data adm
+}
+
+<%= node[:nominatim][:logdir] %>/restricted_ips.log {
+  weekly
+  missingok
+  rotate 5
+  compress
+  delaycompress
+  notifempty
+  create 660 nominatim adm

 }
 }

-<% end -%>