Bump cookstyle from 7.3.10 to 7.3.11

[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 46b1b1a7db5605057065e5eb8f51e0c102349b64..3d042dfc190b1acf540c57f390486df591e133e5 100644 (file)
--- a/cookbooks/nominatim/templates/default/settings.erb
+++ b/cookbooks/nominatim/templates/default/settings.erb
@@ -1,19 +1,17 @@
 <?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_Pyosmium_Binary', '/usr/local/bin/pyosmium-get-changes');
+@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_Use_US_Tiger_Data', true);
 
 @define('CONST_Tablespace_Osm2pgsql_Data', 'dosm');