Bump cookstyle from 6.15.5 to 6.15.9

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

diff --git a/cookbooks/nominatim/recipes/default.rb b/cookbooks/nominatim/recipes/default.rb
index d9297574222e767251df891cb61fef9c38ba5b55..e0a7870d5511d36b2bafc618ac2fe9daf178628d 100644 (file)
--- a/cookbooks/nominatim/recipes/default.rb
+++ b/cookbooks/nominatim/recipes/default.rb
@@ -27,14 +27,14 @@ email_errors = data_bag_item("accounts", "lonvia")["email"]
 directory basedir do
   owner "nominatim"
   group "nominatim"
 directory basedir do
   owner "nominatim"
   group "nominatim"

-  mode 0o755
+  mode "755"

   recursive true
 end
 
 directory node[:nominatim][:logdir] do
   owner "nominatim"
   group "nominatim"
   recursive true
 end
 
 directory node[:nominatim][:logdir] do
   owner "nominatim"
   group "nominatim"

-  mode 0o755
+  mode "755"

   recursive true
 end
 
   recursive true
 end
 


@@ -42,14 +42,14 @@ file "#{node[:nominatim][:logdir]}/query.log" do
   action :create_if_missing
   owner "www-data"
   group "adm"
   action :create_if_missing
   owner "www-data"
   group "adm"

-  mode 0o664
+  mode "664"

 end
 
 file "#{node[:nominatim][:logdir]}/update.log" do
   action :create_if_missing
   owner "nominatim"
   group "adm"
 end
 
 file "#{node[:nominatim][:logdir]}/update.log" do
   action :create_if_missing
   owner "nominatim"
   group "adm"

-  mode 0o664
+  mode "664"

 end
 
 # exception granted for a limited time so that they can set up their own server
 end
 
 # exception granted for a limited time so that they can set up their own server


@@ -99,7 +99,7 @@ end
 directory "#{basedir}/tablespaces" do
   owner "postgres"
   group "postgres"
 directory "#{basedir}/tablespaces" do
   owner "postgres"
   group "postgres"

-  mode 0o700
+  mode "700"

 end
 
 # Note: tablespaces must be exactly in the same location on each
 end
 
 # Note: tablespaces must be exactly in the same location on each


@@ -109,7 +109,7 @@ node[:nominatim][:tablespaces].each do |name, location|
   directory location do
     owner "postgres"
     group "postgres"
   directory location do
     owner "postgres"
     group "postgres"

-    mode 0o700
+    mode "700"

     recursive true
   end
 
     recursive true
   end
 


@@ -133,14 +133,14 @@ if node[:nominatim][:state] == "master"
   directory node[:rsyncd][:modules][:archive][:path] do
     owner "postgres"
     group "postgres"
   directory node[:rsyncd][:modules][:archive][:path] do
     owner "postgres"
     group "postgres"

-    mode 0o700
+    mode "700"

   end
 
   template "/usr/local/bin/clean-db-nominatim" do
     source "clean-db-nominatim.erb"
     owner "root"
     group "root"
   end
 
   template "/usr/local/bin/clean-db-nominatim" do
     source "clean-db-nominatim.erb"
     owner "root"
     group "root"

-    mode 0o755
+    mode "755"

     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[:fqdn] }.join(" ")
     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[:fqdn] }.join(" ")


@@ -174,11 +174,12 @@ package %w[
 
 source_directory = "#{basedir}/nominatim"
 build_directory = "#{basedir}/bin"
 
 source_directory = "#{basedir}/nominatim"
 build_directory = "#{basedir}/bin"

+ui_directory = "#{basedir}/ui"

 
 directory build_directory do
   owner "nominatim"
   group "nominatim"
 
 directory build_directory do
   owner "nominatim"
   group "nominatim"

-  mode 0o755
+  mode "755"

   recursive true
 end
 
   recursive true
 end
 


@@ -209,7 +210,7 @@ template "#{source_directory}/.git/hooks/post-merge" do
   source "git-post-merge-hook.erb"
   owner "nominatim"
   group "nominatim"
   source "git-post-merge-hook.erb"
   owner "nominatim"
   group "nominatim"

-  mode 0o755
+  mode "755"

   variables :srcdir => source_directory,
             :builddir => build_directory,
             :dbname => node[:nominatim][:dbname]
   variables :srcdir => source_directory,
             :builddir => build_directory,
             :dbname => node[:nominatim][:dbname]


@@ -219,13 +220,28 @@ template "#{build_directory}/settings/local.php" do
   source "settings.erb"
   owner "nominatim"
   group "nominatim"
   source "settings.erb"
   owner "nominatim"
   group "nominatim"

-  mode 0o664
+  mode "664"

   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
 
   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
 

+git ui_directory do
+  action :sync
+  repository node[:nominatim][:ui_repository]
+  revision node[:nominatim][:ui_revision]
+  user "nominatim"
+  group "nominatim"
+end
+
+template "#{ui_directory}/dist/config.js" do
+  source "ui-config.js.erb"
+  owner "nominatim"
+  group "nominatim"
+  mode "664"
+end
+

 if node[:nominatim][:flatnode_file]
   directory File.dirname(node[:nominatim][:flatnode_file]) do
     recursive true
 if node[:nominatim][:flatnode_file]
   directory File.dirname(node[:nominatim][:flatnode_file]) do
     recursive true


@@ -236,7 +252,7 @@ template "/etc/logrotate.d/nominatim" do
   source "logrotate.nominatim.erb"
   owner "root"
   group "root"
   source "logrotate.nominatim.erb"
   owner "root"
   group "root"

-  mode 0o644
+  mode "644"

 end
 
 external_data = [
 end
 
 external_data = [


@@ -250,7 +266,7 @@ external_data.each do |fname|
     source "https://www.nominatim.org/data/#{fname}"
     owner "nominatim"
     group "nominatim"
     source "https://www.nominatim.org/data/#{fname}"
     owner "nominatim"
     group "nominatim"

-    mode 0o644
+    mode "644"

   end
 end
 
   end
 end
 


@@ -259,7 +275,7 @@ remote_file "#{source_directory}/data/country_osm_grid.sql.gz" do
   source "https://www.nominatim.org/data/country_grid.sql.gz"
   owner "nominatim"
   group "nominatim"
   source "https://www.nominatim.org/data/country_grid.sql.gz"
   owner "nominatim"
   group "nominatim"

-  mode 0o644
+  mode "644"

 end
 
 if node[:nominatim][:state] == "off"
 end
 
 if node[:nominatim][:state] == "off"


@@ -319,7 +335,7 @@ template "#{source_directory}/utils/nominatim-update" do
   source "updater.erb"
   user "nominatim"
   group "nominatim"
   source "updater.erb"
   user "nominatim"
   group "nominatim"

-  mode 0o755
+  mode "755"

   variables :bindir => build_directory,
             :srcdir => source_directory,
             :logfile => "#{node[:nominatim][:logdir]}/update.log",
   variables :bindir => build_directory,
             :srcdir => source_directory,
             :logfile => "#{node[:nominatim][:logdir]}/update.log",


@@ -332,7 +348,7 @@ template "/etc/init.d/nominatim-update" do
   source "updater.init.erb"
   user "nominatim"
   group "nominatim"
   source "updater.init.erb"
   user "nominatim"
   group "nominatim"

-  mode 0o755
+  mode "755"

   variables :source_directory => source_directory
 end
 
   variables :source_directory => source_directory
 end
 


@@ -341,7 +357,7 @@ end
     source "#{fname}.erb"
     owner "root"
     group "root"
     source "#{fname}.erb"
     owner "root"
     group "root"

-    mode 0o755
+    mode "755"

     variables :db => node[:nominatim][:dbname]
   end
 end
     variables :db => node[:nominatim][:dbname]
   end
 end


@@ -351,7 +367,7 @@ end
 directory "#{basedir}/etc" do
   owner "nominatim"
   group "adm"
 directory "#{basedir}/etc" do
   owner "nominatim"
   group "adm"

-  mode 0o775
+  mode "775"

 end
 
 %w[user_agent referrer email].each do |name|
 end
 
 %w[user_agent referrer email].each do |name|


@@ -359,14 +375,19 @@ end
     action :create_if_missing
     owner "nominatim"
     group "adm"
     action :create_if_missing
     owner "nominatim"
     group "adm"

-    mode 0o664
+    mode "664"

   end
 end
 
 node[:nominatim][:fpm_pools].each do |name, data|
   end
 end
 
 node[:nominatim][:fpm_pools].each do |name, data|

-  php_fpm name do
-    template "fpm.conf.erb"
-    variables data.merge(:name => name)
+  php_fpm name.to_s do
+    port data[:port]
+    pm data[:pm]
+    pm_max_children data[:max_children]
+    pm_start_servers 20
+    pm_min_spare_servers 10
+    pm_max_spare_servers 20
+    pm_max_requests 10000

   end
 end
 
   end
 end
 


@@ -396,14 +417,15 @@ nginx_site "nominatim" do
   directory build_directory
   variables :pools => node[:nominatim][:fpm_pools],
             :frontends => search(:node, "recipes:web\\:\\:frontend"),
   directory build_directory
   variables :pools => node[:nominatim][:fpm_pools],
             :frontends => search(:node, "recipes:web\\:\\:frontend"),

-            :confdir => "#{basedir}/etc"
+            :confdir => "#{basedir}/etc",
+            :ui_directory => ui_directory

 end
 
 template "/etc/logrotate.d/nginx" do
   source "logrotate.nginx.erb"
   owner "root"
   group "root"
 end
 
 template "/etc/logrotate.d/nginx" do
   source "logrotate.nginx.erb"
   owner "root"
   group "root"

-  mode 0o644
+  mode "644"

 end
 
 munin_plugin_conf "nominatim" do
 end
 
 munin_plugin_conf "nominatim" do


@@ -427,7 +449,7 @@ end
 directory "#{basedir}/status" do
   owner "nominatim"
   group "postgres"
 directory "#{basedir}/status" do
   owner "nominatim"
   group "postgres"

-  mode 0o775
+  mode "775"

 end
 
 include_recipe "fail2ban"
 end
 
 include_recipe "fail2ban"