From: Tom Hughes Date: Sun, 10 Jul 2022 07:38:15 +0000 (+0100) Subject: Merge remote-tracking branch 'github/pull/509' X-Git-Url: https://git.openstreetmap.org./chef.git/commitdiff_plain/cdd9554da203812852c212d9636cd89f661c6415?hp=59fe6953bef2b05dfeb41398b5e117c0182a3cee Merge remote-tracking branch 'github/pull/509' --- diff --git a/cookbooks/nominatim/recipes/version4.rb b/cookbooks/nominatim/recipes/version4.rb index c9bdf471e..7b218d951 100644 --- a/cookbooks/nominatim/recipes/version4.rb +++ b/cookbooks/nominatim/recipes/version4.rb @@ -285,7 +285,7 @@ frontends = search(:node, "recipes:web\\:\\:frontend").sort_by(&:name) nginx_site "nominatim" do template "nginx.erb" - directory build_directory + directory project_directory variables :pools => node[:nominatim][:fpm_pools], :frontends => frontends, :confdir => "#{basedir}/etc", diff --git a/roles/pummelzacken.rb b/roles/pummelzacken.rb index a3dbedfb7..36140c371 100644 --- a/roles/pummelzacken.rb +++ b/roles/pummelzacken.rb @@ -31,12 +31,12 @@ default_attributes( :listen_addresses => "10.0.0.20", :work_mem => "160MB", :effective_io_concurrency => "256", - :fsync => "off" + :fsync => "on" } } }, :nominatim => { - :state => "off", + :state => "standalone", :dbcluster => "14/main", :postgis => "3", :enable_backup => true,