X-Git-Url: https://git.openstreetmap.org/chef.git/blobdiff_plain/1dc14a093d2057651fc68cf465419c970d46f8f4..341fc3d5331e0d9c2851eab7c218b3f5ddf01336:/cookbooks/nominatim/recipes/default.rb

diff --git a/cookbooks/nominatim/recipes/default.rb b/cookbooks/nominatim/recipes/default.rb
index 055b87072..9b3ee2b4e 100644
--- a/cookbooks/nominatim/recipes/default.rb
+++ b/cookbooks/nominatim/recipes/default.rb
@@ -124,7 +124,7 @@ if node[:nominatim][:state] == "master" # ~FC023
     mode 0o755
     variables :archive_dir => node[:rsyncd][:modules][:archive][:path],
               :update_stop_file => "#{basedir}/status/updates_disabled",
-              :streaming_clients => search(:node, "nominatim_state:slave").map { |slave| slave[:fdqn] }.join(" ")
+              :streaming_clients => search(:node, "nominatim_state:slave").map { |slave| slave[:fqdn] }.join(" ")
   end
 end
 
@@ -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[:fqdn] : "nominatim.openstreetmap.org",
+            :dbname => node[:nominatim][:dbname],
             :flatnode_file => node[:nominatim][:flatnode_file],
             :log_file => "#{node[:nominatim][:logdir]}/query.log"
 end
@@ -242,6 +243,9 @@ template "#{source_directory}/utils/nominatim-update" do
   user "nominatim"
   group "nominatim"
   mode 0o755
+  variables :logfile => "#{node[:nominatim][:logdir]}/update.log",
+            :branch => node[:nominatim][:revision],
+            :update_stop_file => "#{basedir}/status/updates_disabled"
 end
 
 template "/etc/init.d/nominatim-update" do