X-Git-Url: https://git.openstreetmap.org./chef.git/blobdiff_plain/7aa1c692da44b5441554522d486e01aa02b27c3a..20470a64f04ff1fc122fc5b214c9fc44b364bcee:/cookbooks/nominatim/recipes/default.rb

diff --git a/cookbooks/nominatim/recipes/default.rb b/cookbooks/nominatim/recipes/default.rb
index a33fe85c2..6f3394403 100644
--- a/cookbooks/nominatim/recipes/default.rb
+++ b/cookbooks/nominatim/recipes/default.rb
@@ -42,7 +42,7 @@ end
 
 apache_site "nominatim.openstreetmap.org" do
   template "apache.erb"
-  directory "/home/lonvia/nominatim"
+  directory source_directory
   variables :pools => node[:nominatim][:fpm_pools]
 end
 
@@ -54,7 +54,7 @@ node[:nominatim][:fpm_pools].each do |name,data|
     group "root"
     mode 0644
     variables data.merge(:name => name)
-    notifies :reload, resources(:service => "php5-fpm")
+    notifies :reload, "service[php5-fpm]"
   end
 end
 
@@ -93,6 +93,14 @@ directory "/var/log/nominatim" do
   mode 0755
 end
 
+template "/etc/logrotate.d/nominatim" do
+  source "logrotate.nominatim.erb"
+  owner "root"
+  group "root"
+  mode 0644
+end
+
+
 package "osmosis"
 package "gcc"
 package "proj-bin"
@@ -110,6 +118,7 @@ package "automake"
 package "libproj-dev"
 package "libprotobuf-c0-dev"
 package "protobuf-c-compiler"
+package "python-psycopg2"
 
 execute "php-pear-db" do
   command "pear install DB"
@@ -185,7 +194,7 @@ cron "nominatim_logrotate" do
 end
 
 cron "nominatim_banip" do
-  command "#{source_directory}/utils/cron_banip.sh"
+  command "#{source_directory}/utils/cron_banip.py"
   user "nominatim"
   mailto email_errors
 end
@@ -223,3 +232,38 @@ template "/etc/init.d/nominatim-update" do
   variables :source_directory => source_directory
 end
 
+munin_plugin_conf "nominatim" do
+  template "munin.erb"
+end
+
+munin_plugin "nominatim_importlag" do
+  target "#{source_directory}/munin/nominatim_importlag"
+end
+
+munin_plugin "nominatim_query_speed" do
+  target "#{source_directory}/munin/nominatim_query_speed"
+end
+
+munin_plugin "nominatim_requests" do
+  target "#{source_directory}/munin/nominatim_requests"
+end
+
+munin_plugin "nominatim_throttled_ips" do
+  target "#{source_directory}/munin/nominatim_throttled_ips"
+end
+
+template "/usr/local/bin/backup-nominatim" do
+  source "backup-nominatim.erb"
+  owner "root"
+  group "root"
+  mode 0755
+end
+
+cron "nominatim_backup" do
+  hour "3"
+  minute "00"
+  day "1"
+  command "/usr/local/bin/backup-nominatim"
+  user "nominatim"
+  mailto email_errors
+end