X-Git-Url: https://git.openstreetmap.org/chef.git/blobdiff_plain/a62943629fc45519becfbd66176c9238acbeacbd..8eb585a28a2fbb1a1ad7789d6873aa8d922244ef:/cookbooks/nominatim/recipes/default.rb diff --git a/cookbooks/nominatim/recipes/default.rb b/cookbooks/nominatim/recipes/default.rb index 285d795f1..a26f1862b 100644 --- a/cookbooks/nominatim/recipes/default.rb +++ b/cookbooks/nominatim/recipes/default.rb @@ -170,6 +170,7 @@ package %w[ python3-psycopg2 php-pgsql php-intl + php-symfony-dotenv ] source_directory = "#{basedir}/nominatim" @@ -216,8 +217,8 @@ template "#{source_directory}/.git/hooks/post-merge" do :dbname => node[:nominatim][:dbname] end -template "#{build_directory}/settings/local.php" do - source "settings.erb" +template "#{build_directory}/.env" do + source "nominatim.env.erb" owner "nominatim" group "nominatim" mode "664" @@ -380,7 +381,7 @@ end end node[:nominatim][:fpm_pools].each do |name, data| - php_fpm name.to_s do + php_fpm name do port data[:port] pm data[:pm] pm_max_children data[:max_children] @@ -388,6 +389,7 @@ node[:nominatim][:fpm_pools].each do |name, data| pm_min_spare_servers 10 pm_max_spare_servers 20 pm_max_requests 10000 + prometheus_port data[:prometheus_port] end end