nominatim: use server url when server is not in production

diff --git a/cookbooks/nominatim/recipes/default.rb b/cookbooks/nominatim/recipes/default.rb
index f09918e85cf483bfef9b6ff316d7f4f32929b978..b3f3b1a47cba9306f902212f5e1e889a3deecc5b 100644 (file)
--- 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
   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
             :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 0e335c2e4cf123dc8f4c7aa69e46c3d4a0836201..afab0803e580ae5ca79997df30dade9ce942e896 100644 (file)
--- 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_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
 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 %>');
 
 <% if @flatnode_file -%>
 @define('CONST_Osm2pgsql_Flatnode_File', '<%= @flatnode_file %>');