Fix syntax for hash.

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

diff --git a/cookbooks/nominatim/recipes/default.rb b/cookbooks/nominatim/recipes/default.rb
index 055b87072c771c758bbb1caf290e83a3646502c7..63734cdb8046d55b6b248caf8706ba8aaf162e66 100644 (file)
--- a/cookbooks/nominatim/recipes/default.rb
+++ b/cookbooks/nominatim/recipes/default.rb
@@ -20,6 +20,13 @@
 basedir = data_bag_item("accounts", "nominatim")["home"]
 email_errors = data_bag_item("accounts", "lonvia")["email"]
 
 basedir = data_bag_item("accounts", "nominatim")["home"]
 email_errors = data_bag_item("accounts", "lonvia")["email"]
 

+directory basedir do
+  owner "nominatim"
+  group "nominatim"
+  mode 0o755
+  recursive true
+end
+

 directory node[:nominatim][:logdir] do
   owner "nominatim"
   group "nominatim"
 directory node[:nominatim][:logdir] do
   owner "nominatim"
   group "nominatim"


@@ -41,12 +48,6 @@ file "#{node[:nominatim][:logdir]}/update.log" do
   mode 0o664
 end
 
   mode 0o664
 end
 

-directory "#{basedir}/status" do
-  owner "nominatim"
-  group "postgres"
-  mode 0o775
-end
-

 ## Postgresql
 
 include_recipe "postgresql"
 ## Postgresql
 
 include_recipe "postgresql"


@@ -124,7 +125,7 @@ if node[:nominatim][:state] == "master" # ~FC023
     mode 0o755
     variables :archive_dir => node[:rsyncd][:modules][:archive][:path],
               :update_stop_file => "#{basedir}/status/updates_disabled",
     mode 0o755
     variables :archive_dir => node[:rsyncd][:modules][:archive][:path],
               :update_stop_file => "#{basedir}/status/updates_disabled",

-              :streaming_clients => search(:node, "nominatim_state:slave").map { |slave| slave[:fdqn] }.join(" ")
+              :streaming_clients => search(:node, "nominatim_state:slave").map { |slave| slave[:fqdn] }.join(" ")

   end
 end
 
   end
 end
 


@@ -194,7 +195,8 @@ template "#{build_directory}/settings/local.php" do
   owner "nominatim"
   group "nominatim"
   mode 0o664
   owner "nominatim"
   group "nominatim"
   mode 0o664

-  variables :dbname => node[:nominatim][:dbname],
+  variables :base_url => node[:nominatim][:state] == "off" ? node[:fqdn] : "nominatim.openstreetmap.org",
+            :dbname => node[:nominatim][:dbname],

             :flatnode_file => node[:nominatim][:flatnode_file],
             :log_file => "#{node[:nominatim][:logdir]}/query.log"
 end
             :flatnode_file => node[:nominatim][:flatnode_file],
             :log_file => "#{node[:nominatim][:logdir]}/query.log"
 end


@@ -242,6 +244,11 @@ template "#{source_directory}/utils/nominatim-update" do
   user "nominatim"
   group "nominatim"
   mode 0o755
   user "nominatim"
   group "nominatim"
   mode 0o755

+  variables :bindir => build_directory,
+            :srcdir => source_directory,
+            :logfile => "#{node[:nominatim][:logdir]}/update.log",
+            :branch => node[:nominatim][:revision],
+            :update_stop_file => "#{basedir}/status/updates_disabled"

 end
 
 template "/etc/init.d/nominatim-update" do
 end
 
 template "/etc/init.d/nominatim-update" do


@@ -264,7 +271,7 @@ end
 
 ## webserver frontend
 
 
 ## webserver frontend
 

-template "#{source_directory}/settings/ip_blocks.conf" do
+template "#{build_directory}/settings/ip_blocks.conf" do

   action :create_if_missing
   source "ipblocks.erb"
   owner "nominatim"
   action :create_if_missing
   source "ipblocks.erb"
   owner "nominatim"


@@ -272,14 +279,14 @@ template "#{source_directory}/settings/ip_blocks.conf" do
   mode 0o664
 end
 
   mode 0o664
 end
 

-file "#{source_directory}/settings/apache_blocks.conf" do
+file "#{build_directory}/settings/apache_blocks.conf" do

   action :create_if_missing
   owner "nominatim"
   group "nominatim"
   mode 0o664
 end
 
   action :create_if_missing
   owner "nominatim"
   group "nominatim"
   mode 0o664
 end
 

-file "#{source_directory}/settings/ip_blocks.map" do
+file "#{build_directory}/settings/ip_blocks.map" do

   action :create_if_missing
   owner "nominatim"
   group "nominatim"
   action :create_if_missing
   owner "nominatim"
   group "nominatim"


@@ -326,7 +333,7 @@ end
 
 apache_site "nominatim.openstreetmap.org" do
   template "apache.erb"
 
 apache_site "nominatim.openstreetmap.org" do
   template "apache.erb"

-  directory source_directory
+  directory build_directory

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


@@ -344,7 +351,7 @@ end
 include_recipe "fail2ban"
 
 fail2ban_filter "nominatim" do
 include_recipe "fail2ban"
 
 fail2ban_filter "nominatim" do

-  failregex '^<HOST> - - \[[^]]+\] "[^"]+" 429 '
+  failregex '^<HOST> - - \[\] "[^"]+" 429 '

 end
 
 fail2ban_jail "nominatim" do
 end
 
 fail2ban_jail "nominatim" do


@@ -375,3 +382,9 @@ end
 munin_plugin "nominatim_throttled_ips" do
   target "#{source_directory}/munin/nominatim_throttled_ips"
 end
 munin_plugin "nominatim_throttled_ips" do
   target "#{source_directory}/munin/nominatim_throttled_ips"
 end

+
+directory "#{basedir}/status" do
+  owner "nominatim"
+  group "postgres"
+  mode 0o775
+end