From bb1bb78e6ccae116df30a38ebcbc5fd4153764c0 Mon Sep 17 00:00:00 2001
From: Sarah Hoffmann <lonvia@denofr.de>
Date: Sun, 1 Oct 2017 21:06:33 +0200
Subject: [PATCH] nominatim: move apache log into nominatim logdir

---
 cookbooks/nominatim/recipes/default.rb            |  2 +-
 cookbooks/nominatim/templates/default/apache.erb  |  2 +-
 .../templates/default/logrotate.apache.erb        | 15 +++++++++++++++
 .../templates/default/nominatim.cron.erb          |  2 +-
 4 files changed, 18 insertions(+), 3 deletions(-)

diff --git a/cookbooks/nominatim/recipes/default.rb b/cookbooks/nominatim/recipes/default.rb
index b10c92327..ea5533515 100644
--- a/cookbooks/nominatim/recipes/default.rb
+++ b/cookbooks/nominatim/recipes/default.rb
@@ -379,7 +379,7 @@ end
 
 fail2ban_jail "nominatim" do
   filter "nominatim"
-  logpath "/var/log/apache2/nominatim.openstreetmap.org-access.log"
+  logpath "#{node[:nominatim][:logdir]}/nominatim.openstreetmap.org-access.log"
   ports [80, 443]
   maxretry 100
   ignoreips web_servers
diff --git a/cookbooks/nominatim/templates/default/apache.erb b/cookbooks/nominatim/templates/default/apache.erb
index 652fd93a3..39fa83289 100644
--- a/cookbooks/nominatim/templates/default/apache.erb
+++ b/cookbooks/nominatim/templates/default/apache.erb
@@ -27,7 +27,7 @@
 
     RequestReadTimeout header=15-30,MinRate=500 body=15-30,MinRate=500
 
-    CustomLog /var/log/apache2/nominatim.openstreetmap.org-access.log combined
+    CustomLog <%= node[:nominatim][:logdir] %>/nominatim.openstreetmap.org-access.log combined
     ErrorLog /var/log/apache2/nominatim.openstreetmap.org-error.log
 
     DocumentRoot <%= @directory %>/website
diff --git a/cookbooks/nominatim/templates/default/logrotate.apache.erb b/cookbooks/nominatim/templates/default/logrotate.apache.erb
index fc57f8156..8835397f3 100644
--- a/cookbooks/nominatim/templates/default/logrotate.apache.erb
+++ b/cookbooks/nominatim/templates/default/logrotate.apache.erb
@@ -13,3 +13,18 @@
     /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
+}
diff --git a/cookbooks/nominatim/templates/default/nominatim.cron.erb b/cookbooks/nominatim/templates/default/nominatim.cron.erb
index 0cedfa360..3ad64d4d3 100644
--- a/cookbooks/nominatim/templates/default/nominatim.cron.erb
+++ b/cookbooks/nominatim/templates/default/nominatim.cron.erb
@@ -2,7 +2,7 @@
 
 MAILTO=<%= @mailto %>
 
-* * * * * lonvia <%= @bin_directory %>/cron_ipanalyse.py /var/log/apache2/nominatim.openstreetmap.org-access.log
+* * * * * lonvia <%= @bin_directory %>/cron_ipanalyse.py <%= node[:nominatim][:logdir] %>/nominatim.openstreetmap.org-access.log
 <% if node[:nominatim][:enable_backup] -%>
 00 3 1 * * nominatim /usr/local/bin/backup-nominatim
 <% end -%>
-- 
2.43.2