Merge remote-tracking branch 'github/pull/349' into master

[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 89c6febcc4b1bd6fa50aeef93c6aa209967738da..3d042dfc190b1acf540c57f390486df591e133e5 100644 (file)
--- a/cookbooks/nominatim/templates/default/settings.erb
+++ b/cookbooks/nominatim/templates/default/settings.erb
@@ -1,17 +1,19 @@
 <?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://nominatim.openstreetmap.org/');
-else
-    @define('CONST_Website_BaseURL', 'http://nominatim.openstreetmap.org/');
+@define('CONST_Database_DSN', 'pgsql:dbname=<%= @dbname %>');
+@define('CONST_Website_BaseURL', 'https://<%= @base_url %>/');
+@define('CONST_MapIcon_URL', 'https://<%= @base_url %>/ui/mapicons/');

 
 <% 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_Tablespace_Osm2pgsql_Index', 'iosm');
 @define('CONST_Tablespace_Place_Data', 'dplace');
 @define('CONST_Tablespace_Osm2pgsql_Data', 'dosm');
 @define('CONST_Tablespace_Osm2pgsql_Index', 'iosm');
 @define('CONST_Tablespace_Place_Data', 'dplace');