X-Git-Url: https://git.openstreetmap.org/chef.git/blobdiff_plain/ff044920428608b2c04507ad52d6ab52c9d6555f..6d1e54ea9e1a63b69b52eff117b0c54be427d6fd:/cookbooks/nominatim/recipes/default.rb

diff --git a/cookbooks/nominatim/recipes/default.rb b/cookbooks/nominatim/recipes/default.rb
index ab4e6e15e..14b1852b5 100644
--- a/cookbooks/nominatim/recipes/default.rb
+++ b/cookbooks/nominatim/recipes/default.rb
@@ -32,19 +32,20 @@ apache_module "rewrite"
 apache_module "proxy"
 apache_module "proxy_fcgi"
 
+passwords = data_bag_item("nominatim", "passwords")
 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_version = database_cluster.sub(%r{/.*}, "")
 database_name = node[:nominatim][:database][:dbname]
 
 postgis_version = node[:nominatim][:database][:postgis]
 
 service "php5-fpm" do
   provider Chef::Provider::Service::Upstart
-  action [ :enable, :start ]
+  action [:enable, :start]
   supports :status => true, :restart => true, :reload => true
 end
 
@@ -55,10 +56,10 @@ apache_site "nominatim.openstreetmap.org" do
 end
 
 apache_site "default" do
-  action [ :disable ]
+  action [:disable]
 end
 
-node[:nominatim][:fpm_pools].each do |name,data|
+node[:nominatim][:fpm_pools].each do |name, data|
   template "/etc/php5/fpm/pool.d/#{name}.conf" do
     source "fpm.conf.erb"
     owner "root"
@@ -69,28 +70,23 @@ node[:nominatim][:fpm_pools].each do |name,data|
   end
 end
 
-postgresql_user "tomh" do
-  cluster database_cluster
-  superuser true
-end
-
-postgresql_user "lonvia" do
-  cluster database_cluster
-  superuser true
-end
+superusers = %w(tomh lonvia twain nominatim)
 
-postgresql_user "twain" do
-  cluster database_cluster
-  superuser true
+superusers.each do |user|
+  postgresql_user user do
+    cluster database_cluster
+    superuser true
+  end
 end
 
-postgresql_user "nominatim" do
+postgresql_user "www-data" do
   cluster database_cluster
-  superuser true
 end
 
-postgresql_user "www-data" do
+postgresql_user "replication" do
   cluster database_cluster
+  password passwords["replication"]
+  replication true
 end
 
 postgresql_munin "nominatim" do
@@ -111,7 +107,6 @@ template "/etc/logrotate.d/nominatim" do
   mode 0644
 end
 
-
 package "osmosis"
 package "gcc"
 package "proj-bin"
@@ -161,12 +156,11 @@ directory "#{source_directory}/log" do
   mode 0755
 end
 
-
 template "#{source_directory}/.git/hooks/post-merge" do
   source "update_source.erb"
-  owner  "nominatim"
-  group  "nominatim"
-  mode   0755
+  owner "nominatim"
+  group "nominatim"
+  mode 0755
   variables :source_directory => source_directory
 end
 
@@ -215,19 +209,18 @@ template "/etc/cron.d/nominatim" do
   variables :bin_directory => "#{source_directory}/utils", :mailto => email_errors
 end
 
-
 template "#{source_directory}/utils/nominatim-update" do
   source "updater.erb"
-  user   "nominatim"
-  group  "nominatim"
-  mode   0755
+  user "nominatim"
+  group "nominatim"
+  mode 0755
 end
 
 template "/etc/init.d/nominatim-update" do
   source "updater.init.erb"
-  user   "nominatim"
-  group  "nominatim"
-  mode   0755
+  user "nominatim"
+  group "nominatim"
+  mode 0755
   variables :source_directory => source_directory
 end
 
@@ -251,35 +244,31 @@ munin_plugin "nominatim_throttled_ips" do
   target "#{source_directory}/munin/nominatim_throttled_ips"
 end
 
-remote_file "#{source_directory}/data/wikipedia_article.sql.bin" do
-  action :create_if_missing
-  source "http://www.nominatim.org/data/wikipedia_article.sql.bin"
-  owner  "nominatim"
-  group  "nominatim"
-  mode   0644
-end
+external_data = [
+  "wikipedia_article.sql.bin",
+  "wikipedia_redirect.sql.bin",
+  "gb_postcode_data.sql.gz"
+]
 
-remote_file "#{source_directory}/data/wikipedia_redirect.sql.bin" do
-  action :create_if_missing
-  source "http://www.nominatim.org/data/wikipedia_redirect.sql.bin"
-  owner  "nominatim"
-  group  "nominatim"
-  mode   0644
+external_data.each do |fname|
+  remote_file "#{source_directory}/data/#{fname}" do
+    action :create_if_missing
+    source "http://www.nominatim.org/data/#{fname}"
+    owner "nominatim"
+    group "nominatim"
+    mode 0644
+  end
 end
 
-remote_file "#{source_directory}/data/gb_postcode_data.sql.gz" do
-  action :create_if_missing
-  source "http://www.nominatim.org/data/gb_postcode_data.sql.gz"
-  owner  "nominatim"
-  group  "nominatim"
-  mode   0644
-end
+additional_scripts = %w(backup-nominatim clean-db-nominatim)
 
-template "/usr/local/bin/backup-nominatim" do
-  source "backup-nominatim.erb"
-  owner "root"
-  group "root"
-  mode 0755
+additional_scripts.each do |fname|
+  template "/usr/local/bin/#{fname}" do
+    source "#{fname}.erb"
+    owner "root"
+    group "root"
+    mode 0755
+  end
 end
 
 directory File.dirname(node[:nominatim][:flatnode_file]) do
@@ -288,3 +277,10 @@ directory File.dirname(node[:nominatim][:flatnode_file]) do
   mode 0755
   recursive true
 end
+
+directory "/data/postgresql-archive" do
+  owner "postgres"
+  group "postgres"
+  mode 0700
+  only_if { node[:postgresql][:settings][:defaults][:archive_mode] == "on" }
+end