Use TCP/IP connections for FPM on 14.04

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

diff --git a/cookbooks/nominatim/recipes/default.rb b/cookbooks/nominatim/recipes/default.rb
index 64e484b39adadcbcca48d720e3d9a5a369bef73f..3f490b2727741a1c2e8c8bef77459f31c6d6dfaa 100644 (file)
--- a/cookbooks/nominatim/recipes/default.rb
+++ b/cookbooks/nominatim/recipes/default.rb
@@ -29,7 +29,13 @@ package "php-pear"
 package "php-apc"
 
 apache_module "rewrite"
-apache_module "fastcgi-handler"
+
+if node[:lsb][:release].to_f >= 14.04
+  apache_module "proxy"
+  apache_module "proxy_fcgi"
+else
+  apache_module "fastcgi-handler"
+end
 
 home_directory = data_bag_item("accounts", "nominatim")["home"]
 source_directory = "#{home_directory}/nominatim"
@@ -42,6 +48,9 @@ database_name = node[:nominatim][:database][:dbname]
 postgis_version = node[:nominatim][:database][:postgis]
 
 service "php5-fpm" do
+  if node[:lsb][:release].to_f >= 14.04
+    provider Chef::Provider::Service::Upstart
+  end
   action [ :enable, :start ]
   supports :status => true, :restart => true, :reload => true
 end
@@ -58,7 +67,7 @@ node[:nominatim][:fpm_pools].each do |name,data|
     owner "root"
     group "root"
     mode 0644
-    variables data.merge(:name => name)
+    variables data.merge(:name => name, :port => data[:port])
     notifies :reload, "service[php5-fpm]"
   end
 end
@@ -189,7 +198,14 @@ file "#{source_directory}/settings/ip_blocks.map" do
   mode 0664
 end
 
+if node[:nominatim][:enabled]
+  cron_action = :create
+else
+  cron_action = :delete
+end
+
 cron "nominatim_logrotate" do
+  action cron_action
   hour "5"
   minute "30"
   weekday "0"
@@ -199,12 +215,14 @@ cron "nominatim_logrotate" do
 end
 
 cron "nominatim_banip" do
+  action cron_action
   command "#{source_directory}/utils/cron_banip.py"
   user "nominatim"
   mailto email_errors
 end
 
 cron "nominatim_vacuum" do
+  action cron_action
   hour "2"
   minute "00"
   command "#{source_directory}/utils/cron_vacuum.sh"
@@ -265,6 +283,7 @@ template "/usr/local/bin/backup-nominatim" do
 end
 
 cron "nominatim_backup" do
+  action cron_action
   hour "3"
   minute "00"
   day "1"