From 33f0874cd63730504cca33b771bc012c70d65689 Mon Sep 17 00:00:00 2001 From: Sarah Hoffmann Date: Wed, 30 Dec 2020 11:27:24 +0100 Subject: [PATCH 1/1] nominatim: add config in new dotenv format --- cookbooks/nominatim/recipes/default.rb | 11 ++++++++ .../templates/default/nominatim.env.erb | 26 +++++++++++++++++++ 2 files changed, 37 insertions(+) create mode 100644 cookbooks/nominatim/templates/default/nominatim.env.erb diff --git a/cookbooks/nominatim/recipes/default.rb b/cookbooks/nominatim/recipes/default.rb index b5496a652..445ef7b5a 100644 --- a/cookbooks/nominatim/recipes/default.rb +++ b/cookbooks/nominatim/recipes/default.rb @@ -227,6 +227,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] diff --git a/cookbooks/nominatim/templates/default/nominatim.env.erb b/cookbooks/nominatim/templates/default/nominatim.env.erb new file mode 100644 index 000000000..062d5f96c --- /dev/null +++ b/cookbooks/nominatim/templates/default/nominatim.env.erb @@ -0,0 +1,26 @@ +# DO NOT EDIT - This file is being maintained by Chef + +NOMINATIM_DATABASE_DSN="<%= @dbname %>" +NOMINATIM_MAPICON_URL="https://<%= @base_url %>/ui/mapicons/" + +<% if @flatnode_file -%> +NOMINATIM_FLATNODE_FILE="<%= @flatnode_file %>" +<% end -%> + +NOMINATIM_IMPORT_STYLE=extratags + +NOMINATIM_USE_US_TIGER_DATA=yes + +NOMINATIM_TABLESPACE_SEARCH_DATA=dsearch +NOMINATIM_TABLESPACE_SEARCH_INDEX=isearch +NOMINATIM_TABLESPACE_OSM_DATA=dosm +NOMINATIM_TABLESPACE_OSM_INDEX=iosm +NOMINATIM_TABLESPACE_PLACE_DATA=dplace +NOMINATIM_TABLESPACE_PLACE_INDEX=iplace +NOMINATIM_TABLESPACE_ADDRESS_DATA=daddress +NOMINATIM_TABLESPACE_ADDRESS_INDEX=iaddress +NOMINATIM_TABLESPACE_AUX_DATA=daux +NOMINATIM_TABLESPACE_AUX_INDEX=iaux + +NOMINATIM_LOG_DB=no +NOMINATIM_LOG_FILE="<%= @log_file %>" -- 2.45.2