dulcy: switch to postgresql 12

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

diff --git a/cookbooks/nominatim/templates/default/settings.erb b/cookbooks/nominatim/templates/default/settings.erb
index afab0803e580ae5ca79997df30dade9ce942e896..1a60ef30fb83c5cce67110c6f3207364959646f7 100644 (file)
--- a/cookbooks/nominatim/templates/default/settings.erb
+++ b/cookbooks/nominatim/templates/default/settings.erb
@@ -1,17 +1,16 @@
 <?php
 # DO NOT EDIT - This file is being maintained by Chef
 
 <?php
 # DO NOT EDIT - This file is being maintained by Chef
 

-@define('CONST_Database_DSN', 'pgsql://@/<%= @dbname %>');
-if (isset($_SERVER['HTTPS']) && !empty($_SERVER['HTTPS']))
-    @define('CONST_Website_BaseURL', 'https://<%= @base_url %>/');
-else
-    @define('CONST_Website_BaseURL', 'http://<%= @base_url %>/');
+@define('CONST_Database_DSN', 'pgsql:dbname=<%= @dbname %>');
+@define('CONST_Website_BaseURL', 'https://<%= @base_url %>/');

 
 <% if @flatnode_file -%>
 @define('CONST_Osm2pgsql_Flatnode_File', '<%= @flatnode_file %>');
 <% end -%>
 @define('CONST_Search_NameOnlySearchFrequencyThreshold', 500);
 
 
 <% if @flatnode_file -%>
 @define('CONST_Osm2pgsql_Flatnode_File', '<%= @flatnode_file %>');
 <% end -%>
 @define('CONST_Search_NameOnlySearchFrequencyThreshold', 500);
 

+@define('CONST_Import_Style', CONST_BasePath.'/settings/import-extratags.style');
+

 @define('CONST_Use_US_Tiger_Data', true);
 
 @define('CONST_Tablespace_Osm2pgsql_Data', 'dosm');
 @define('CONST_Use_US_Tiger_Data', true);
 
 @define('CONST_Tablespace_Osm2pgsql_Data', 'dosm');