From: Guillaume RISCHARD <git@stereo.lu>
Date: Tue, 16 Jan 2018 14:10:32 +0000 (+0100)
Subject: Use https URL for html base tag for nominatim.openstreetmap.org.
X-Git-Url: https://git.openstreetmap.org/chef.git/commitdiff_plain/c0d36445d65eacdd7dc9b3cae88ab5b5f59c842c?hp=5239c5f1a1d13c8c34024e01f8c98282fa085181

Use https URL for html base tag for nominatim.openstreetmap.org.
---

diff --git a/cookbooks/nominatim/templates/default/settings.erb b/cookbooks/nominatim/templates/default/settings.erb
index 46b1b1a7d..454f56b5d 100644
--- a/cookbooks/nominatim/templates/default/settings.erb
+++ b/cookbooks/nominatim/templates/default/settings.erb
@@ -2,10 +2,7 @@
 # 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_Website_BaseURL', 'https://<%= @base_url %>/');
 
 @define('CONST_Pyosmium_Binary', '/usr/local/bin/pyosmium-get-changes');