From ca2e5d46228417b3996f8b0abda659a2f07a9047 Mon Sep 17 00:00:00 2001 From: Sarah Hoffmann Date: Fri, 23 Sep 2016 12:26:18 +0200 Subject: [PATCH 1/1] nominatim: use server url when server is not in production --- cookbooks/nominatim/recipes/default.rb | 3 ++- cookbooks/nominatim/templates/default/settings.erb | 4 ++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/cookbooks/nominatim/recipes/default.rb b/cookbooks/nominatim/recipes/default.rb index f09918e85..b3f3b1a47 100644 --- a/cookbooks/nominatim/recipes/default.rb +++ b/cookbooks/nominatim/recipes/default.rb @@ -194,7 +194,8 @@ template "#{build_directory}/settings/local.php" do owner "nominatim" group "nominatim" mode 0o664 - variables :dbname => node[:nominatim][:dbname], + variables :base_url => node[:nominatim][:state] == "off" ? node[:fdqn] : "nominatim.openstreetmap.org", + :dbname => node[:nominatim][:dbname], :flatnode_file => node[:nominatim][:flatnode_file], :log_file => "#{node[:nominatim][:logdir]}/query.log" end diff --git a/cookbooks/nominatim/templates/default/settings.erb b/cookbooks/nominatim/templates/default/settings.erb index 0e335c2e4..afab0803e 100644 --- a/cookbooks/nominatim/templates/default/settings.erb +++ b/cookbooks/nominatim/templates/default/settings.erb @@ -3,9 +3,9 @@ @define('CONST_Database_DSN', 'pgsql://@/<%= @dbname %>'); if (isset($_SERVER['HTTPS']) && !empty($_SERVER['HTTPS'])) - @define('CONST_Website_BaseURL', 'https://nominatim.openstreetmap.org/'); + @define('CONST_Website_BaseURL', 'https://<%= @base_url %>/'); else - @define('CONST_Website_BaseURL', 'http://nominatim.openstreetmap.org/'); + @define('CONST_Website_BaseURL', 'http://<%= @base_url %>/'); <% if @flatnode_file -%> @define('CONST_Osm2pgsql_Flatnode_File', '<%= @flatnode_file %>'); -- 2.43.2