Convert all notify/subscribe calls to the new style syntax

[chef.git] / cookbooks / nominatim / recipes / default.rb

diff --git a/cookbooks/nominatim/recipes/default.rb b/cookbooks/nominatim/recipes/default.rb
index 8f08ef5af3f418ce5d6ad07b3b3630b761c37da6..dfa2df7c118ee3c3ddcb391ccb052472b4c94d40 100644 (file)
--- 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
 
@@ -224,3 +224,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