nominatim: complete rework of the setup

[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..aca17fdd5f9db28ce201945a085ced4578690a35 100644 (file)
--- a/cookbooks/nominatim/templates/default/nominatim.env.erb
+++ b/cookbooks/nominatim/templates/default/nominatim.env.erb
@@ -1,7 +1,7 @@
 # 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 %>"
@@ -11,6 +11,8 @@ NOMINATIM_IMPORT_STYLE=extratags
 
 NOMINATIM_USE_US_TIGER_DATA=yes
 
+NOMINATIM_TOKENIZER="<%= @tokenizer %>"
+
 NOMINATIM_TABLESPACE_SEARCH_DATA=dsearch
 NOMINATIM_TABLESPACE_SEARCH_INDEX=isearch
 NOMINATIM_TABLESPACE_OSM_DATA=dosm