Merge remote-tracking branch 'github/pull/89'

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

diff --git a/cookbooks/nominatim/templates/default/nominatim.erb b/cookbooks/nominatim/templates/default/nominatim.erb
index ea486ad249533c11cb32d9c660426a1950534d9f..6e911223d93f7a1a62560b6bcef0ce62fd806993 100644 (file)
--- a/cookbooks/nominatim/templates/default/nominatim.erb
+++ b/cookbooks/nominatim/templates/default/nominatim.erb
@@ -2,5 +2,20 @@
 # DO NOT EDIT - This file is being maintained by Chef
 
 @define('CONST_Database_DSN', 'pgsql://@/<%= node[:nominatim][:database][:dbname] %>');
-@define('CONST_Website_BaseURL', 'http://nominatim.openstreetmap.org/');
+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_Postgresql_Version', '<%= @postgres_version %>');
+@define('CONST_Postgis_Version', '<%= node[:nominatim][:database][:postgis] %>');
+
+@define('CONST_Osm2pgsql_Flatnode_File', '<%= node[:nominatim][:flatnode_file] %>');
+@define('CONST_Search_NameOnlySearchFrequencyThreshold', 500);
+
+<% node[:nominatim][:tablespaces].each do |part,name| -%>
+@define('CONST_Tablespace_<%= part %>', '<%= name %>');
+<% end -%>
+
+@define('CONST_Log_File', '<%= node[:nominatim][:logdir] %>/query.log');
+@define('CONST_Log_DB', false);