Make munin use the node name instead of the FQDN

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

diff --git a/cookbooks/nominatim/templates/default/logrotate.apache.erb b/cookbooks/nominatim/templates/default/logrotate.apache.erb
index 4948b5ce1272b263fcffbc2db3be1f9b0193131a..8835397f3081a2a0e2611d3f9c1d67acf31ccb8d 100644 (file)
--- a/cookbooks/nominatim/templates/default/logrotate.apache.erb
+++ b/cookbooks/nominatim/templates/default/logrotate.apache.erb
@@ -1,17 +1,30 @@
 # DO NOT EDIT - This file is being maintained by Chef
 
 /var/log/apache2/*.log {
-  weekly
+  daily
   missingok
-  rotate 6
+  rotate 42
   compress
   delaycompress
   notifempty
   create 640 root adm
   sharedscripts
   postrotate
-    if /etc/init.d/apache2 status > /dev/null ; then \
-        /etc/init.d/apache2 reload > /dev/null; \
-    fi;
+    /bin/systemctl reload apache2
+  endscript
+}
+
+
+<%= node[:nominatim][:logdir] %>/nominatim.openstreetmap.org-access.log {
+  daily
+  missingok
+  rotate 42
+  compress
+  delaycompress
+  notifempty
+  create 640 root adm
+  sharedscripts
+  postrotate
+    /bin/systemctl reload apache2
   endscript
 }