apache ssl: Do not pass OCSP stapling failures to client

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

diff --git a/cookbooks/nominatim/recipes/default.rb b/cookbooks/nominatim/recipes/default.rb
index ba010b0d6c5793a59f50bd396a1ef94f3a0765e3..af96a9c771977cc6df90a8c4c7fe0ca342d621e5 100644 (file)
--- a/cookbooks/nominatim/recipes/default.rb
+++ b/cookbooks/nominatim/recipes/default.rb
@@ -48,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,13 +61,17 @@ apache_site "nominatim.openstreetmap.org" do
   variables :pools => node[:nominatim][:fpm_pools]
 end
 
+apache_site "default" do
+  action [ :disable ]
+end
+
 node[:nominatim][:fpm_pools].each do |name,data|
   template "/etc/php5/fpm/pool.d/#{name}.conf" do
     source "fpm.conf.erb"
     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
@@ -195,7 +202,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"
@@ -205,12 +219,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"
@@ -218,16 +234,6 @@ cron "nominatim_vacuum" do
   mailto email_errors
 end
 
-['search', 'reverse'].each do |filename|
-  ['phpj', 'phpx'].each do |ext|
-    link "#{source_directory}/website/#{filename}.#{ext}" do
-      to "#{source_directory}/website/#{filename}.php"
-      user "nominatim"
-      group "nominatim"
-    end
-  end
-end
-
 template "#{source_directory}/utils/nominatim-update" do
   source "updater.erb"
   user   "nominatim"
@@ -271,6 +277,7 @@ template "/usr/local/bin/backup-nominatim" do
 end
 
 cron "nominatim_backup" do
+  action cron_action
   hour "3"
   minute "00"
   day "1"