nominatim: reorganise recipe for Debian installation

[chef.git] / cookbooks / nominatim / templates / default / nominatim.env.erb

diff --git a/cookbooks/nominatim/templates/default/nominatim.env.erb b/cookbooks/nominatim/templates/default/nominatim.env.erb
index 062d5f96c46e3a27869557e814309e6471290070..37cb6da495122d6f02a89e12c7419370a2227145 100644 (file)
--- a/cookbooks/nominatim/templates/default/nominatim.env.erb
+++ b/cookbooks/nominatim/templates/default/nominatim.env.erb
@@ -1,16 +1,25 @@
 # DO NOT EDIT - This file is being maintained by Chef
 
 # DO NOT EDIT - This file is being maintained by Chef
 

-NOMINATIM_DATABASE_DSN="<%= @dbname %>"
-NOMINATIM_MAPICON_URL="https://<%= @base_url %>/ui/mapicons/"
+NOMINATIM_DATABASE_DSN="pgsql:dbname=<%= @dbname %>"
+NOMINATIM_MAPICON_URL="https://<%= @base_url %>/ui/mapicons"

 
 <% if @flatnode_file -%>
 NOMINATIM_FLATNODE_FILE="<%= @flatnode_file %>"
 <% end -%>
 
 
 <% if @flatnode_file -%>
 NOMINATIM_FLATNODE_FILE="<%= @flatnode_file %>"
 <% end -%>
 

+NOMINATIM_SERVE_LEGACY_URLS=yes
+NOMINATIM_API_POOL_SIZE=<%= @pool_size %>
+NOMINATIM_QUERY_TIMEOUT=<%= @query_timeout %>
+NOMINATIM_REQUEST_TIMEOUT=<%= @request_timeout %>
+

 NOMINATIM_IMPORT_STYLE=extratags
 
 NOMINATIM_USE_US_TIGER_DATA=yes
 
 NOMINATIM_IMPORT_STYLE=extratags
 
 NOMINATIM_USE_US_TIGER_DATA=yes
 

+<% if node.platform?("ubuntu") -%>
+NOMINATIM_TOKENIZER="<%= @tokenizer %>"
+NOMINATIM_UPDATE_FORWARD_DEPENDENCIES="<%= @forward_dependencies %>"
+

 NOMINATIM_TABLESPACE_SEARCH_DATA=dsearch
 NOMINATIM_TABLESPACE_SEARCH_INDEX=isearch
 NOMINATIM_TABLESPACE_OSM_DATA=dosm
 NOMINATIM_TABLESPACE_SEARCH_DATA=dsearch
 NOMINATIM_TABLESPACE_SEARCH_INDEX=isearch
 NOMINATIM_TABLESPACE_OSM_DATA=dosm


@@ -21,6 +30,8 @@ NOMINATIM_TABLESPACE_ADDRESS_DATA=daddress
 NOMINATIM_TABLESPACE_ADDRESS_INDEX=iaddress
 NOMINATIM_TABLESPACE_AUX_DATA=daux
 NOMINATIM_TABLESPACE_AUX_INDEX=iaux
 NOMINATIM_TABLESPACE_ADDRESS_INDEX=iaddress
 NOMINATIM_TABLESPACE_AUX_DATA=daux
 NOMINATIM_TABLESPACE_AUX_INDEX=iaux

+<% end -%>
+

 
 NOMINATIM_LOG_DB=no
 NOMINATIM_LOG_FILE="<%= @log_file %>"
 
 NOMINATIM_LOG_DB=no
 NOMINATIM_LOG_FILE="<%= @log_file %>"