X-Git-Url: https://git.openstreetmap.org./chef.git/blobdiff_plain/adb5633e8d090fe4688f92e8ca5dfbb4ad8c3feb..70a881ccfdde37f4357daf090e80fd1c71c2900a:/cookbooks/nominatim/recipes/default.rb?ds=inline diff --git a/cookbooks/nominatim/recipes/default.rb b/cookbooks/nominatim/recipes/default.rb index 285d795f1..d2fc8ec2c 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" @@ -227,6 +228,17 @@ template "#{build_directory}/settings/local.php" do :log_file => "#{node[:nominatim][:logdir]}/query.log" end +template "#{build_directory}/.env" do + source "nominatim.env.erb" + owner "nominatim" + group "nominatim" + 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 + git ui_directory do action :sync repository node[:nominatim][:ui_repository] @@ -380,7 +392,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 +400,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