X-Git-Url: https://git.openstreetmap.org./chef.git/blobdiff_plain/eecaf26698348adf3d3b64ea680ad82f959a5ae4..45987a97b2cb6874f9f8d1772255808af3ffb7fa:/cookbooks/nominatim/recipes/default.rb diff --git a/cookbooks/nominatim/recipes/default.rb b/cookbooks/nominatim/recipes/default.rb index 285d795f1..78717add8 100644 --- a/cookbooks/nominatim/recipes/default.rb +++ b/cookbooks/nominatim/recipes/default.rb @@ -168,8 +168,10 @@ package %w[ python3-pyosmium pyosmium python3-psycopg2 + python3-dotenv php-pgsql php-intl + php-symfony-dotenv ] source_directory = "#{basedir}/nominatim" @@ -216,8 +218,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 +382,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 +390,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