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 f6a57a8efc7d78047bed6e9ac42e404e9e485c1a..af96a9c771977cc6df90a8c4c7fe0ca342d621e5 100644 (file)
--- a/cookbooks/nominatim/recipes/default.rb
+++ b/cookbooks/nominatim/recipes/default.rb
@@ -17,7 +17,7 @@
 # limitations under the License.
 #
 
 # limitations under the License.
 #
 

-include_recipe "apache"
+include_recipe "apache::ssl"

 include_recipe "postgresql"
 include_recipe "git"
 
 include_recipe "postgresql"
 include_recipe "git"
 


@@ -29,62 +29,80 @@ package "php-pear"
 package "php-apc"
 
 apache_module "rewrite"
 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"
 email_errors = data_bag_item("accounts", "lonvia")["email"]
 
 
 home_directory = data_bag_item("accounts", "nominatim")["home"]
 source_directory = "#{home_directory}/nominatim"
 email_errors = data_bag_item("accounts", "lonvia")["email"]
 

+database_cluster = node[:nominatim][:database][:cluster]
+database_version = database_cluster.sub(/\/.*/, "")
+database_name = node[:nominatim][:database][:dbname]
+
+postgis_version = node[:nominatim][:database][:postgis]
+

 service "php5-fpm" do
 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
 
 apache_site "nominatim.openstreetmap.org" do
   template "apache.erb"
   action [ :enable, :start ]
   supports :status => true, :restart => true, :reload => true
 end
 
 apache_site "nominatim.openstreetmap.org" do
   template "apache.erb"

-  directory "/home/lonvia/nominatim"
+  directory source_directory

   variables :pools => node[:nominatim][:fpm_pools]
 end
 
   variables :pools => node[:nominatim][:fpm_pools]
 end
 

-node[:nominatim][:fpm_pools].each do |name,data|
+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
   template "/etc/php5/fpm/pool.d/#{name}.conf" do
     source "fpm.conf.erb"
     owner "root"
     group "root"
     mode 0644

-    variables data.merge(:name => name)
-    notifies :reload, resources(:service => "php5-fpm")
+    variables data.merge(:name => name, :port => data[:port])
+    notifies :reload, "service[php5-fpm]"

   end
 end
 
 postgresql_user "tomh" do
   end
 end
 
 postgresql_user "tomh" do

-  cluster "9.1/main"
+  cluster database_cluster

   superuser true
 end
 
 postgresql_user "lonvia" do
   superuser true
 end
 
 postgresql_user "lonvia" do

-  cluster "9.1/main"
+  cluster database_cluster

   superuser true
 end
 
 postgresql_user "twain" do
   superuser true
 end
 
 postgresql_user "twain" do

-  cluster "9.1/main"
+  cluster database_cluster

   superuser true
 end
 
 postgresql_user "nominatim" do
   superuser true
 end
 
 postgresql_user "nominatim" do

-  cluster "9.1/main"
+  cluster database_cluster

   superuser true
 end
 
 postgresql_user "www-data" do
   superuser true
 end
 
 postgresql_user "www-data" do

-  cluster "9.1/main"
+  cluster database_cluster

 end
 
 postgresql_munin "nominatim" do
 end
 
 postgresql_munin "nominatim" do

-  cluster "9.1/main"
-  database "nominatim"
+  cluster database_cluster
+  database database_name

 end
 
 directory "/var/log/nominatim" do
 end
 
 directory "/var/log/nominatim" do


@@ -93,12 +111,20 @@ directory "/var/log/nominatim" do
   mode 0755
 end
 
   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"
 package "libgeos-c1"
 package "osmosis"
 package "gcc"
 package "proj-bin"
 package "libgeos-c1"

-package "postgresql-9.1-postgis"
-package "postgresql-server-dev-9.1"
+package "postgresql-#{database_version}-postgis-#{postgis_version}"
+package "postgresql-server-dev-#{database_version}"

 package "build-essential"
 package "libxml2-dev"
 package "libgeos-dev"
 package "build-essential"
 package "libxml2-dev"
 package "libgeos-dev"


@@ -110,6 +136,7 @@ package "automake"
 package "libproj-dev"
 package "libprotobuf-c0-dev"
 package "protobuf-c-compiler"
 package "libproj-dev"
 package "libprotobuf-c0-dev"
 package "protobuf-c-compiler"

+package "python-psycopg2"

 
 execute "php-pear-db" do
   command "pear install DB"
 
 execute "php-pear-db" do
   command "pear install DB"


@@ -175,7 +202,14 @@ file "#{source_directory}/settings/ip_blocks.map" do
   mode 0664
 end
 
   mode 0664
 end
 

+if node[:nominatim][:enabled]
+  cron_action = :create
+else
+  cron_action = :delete
+end
+

 cron "nominatim_logrotate" do
 cron "nominatim_logrotate" do

+  action cron_action

   hour "5"
   minute "30"
   weekday "0"
   hour "5"
   minute "30"
   weekday "0"


@@ -185,12 +219,14 @@ cron "nominatim_logrotate" do
 end
 
 cron "nominatim_banip" 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
   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"
   hour "2"
   minute "00"
   command "#{source_directory}/utils/cron_vacuum.sh"


@@ -198,16 +234,6 @@ cron "nominatim_vacuum" do
   mailto email_errors
 end
 
   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"
 template "#{source_directory}/utils/nominatim-update" do
   source "updater.erb"
   user   "nominatim"


@@ -223,3 +249,39 @@ template "/etc/init.d/nominatim-update" do
   variables :source_directory => source_directory
 end
 
   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
+  action cron_action
+  hour "3"
+  minute "00"
+  day "1"
+  command "/usr/local/bin/backup-nominatim"
+  user "nominatim"
+  mailto email_errors
+end