From: Sarah Hoffmann <lonvia@denofr.de>
Date: Mon, 21 Nov 2022 13:43:21 +0000 (+0100)
Subject: nominatim: make forward dependencies configurable
X-Git-Url: https://git.openstreetmap.org./chef.git/commitdiff_plain/39769561c0793eaacb56a3d35c711c36e81a5456

nominatim: make forward dependencies configurable
---

diff --git a/cookbooks/nominatim/attributes/default.rb b/cookbooks/nominatim/attributes/default.rb
index dca4e71e6..301faf53d 100644
--- a/cookbooks/nominatim/attributes/default.rb
+++ b/cookbooks/nominatim/attributes/default.rb
@@ -24,7 +24,8 @@ default[:nominatim][:fpm_pools] = {
 }
 
 default[:nominatim][:config] = {
-  :tokenizer => "icu"
+  :tokenizer => "icu",
+  :forward_dependencies => "no"
 }
 
 default[:nominatim][:redirects] = {}
diff --git a/cookbooks/nominatim/recipes/default.rb b/cookbooks/nominatim/recipes/default.rb
index 7b218d951..fbfdfe25f 100644
--- a/cookbooks/nominatim/recipes/default.rb
+++ b/cookbooks/nominatim/recipes/default.rb
@@ -226,7 +226,8 @@ template "#{project_directory}/.env" do
             :dbname => node[:nominatim][:dbname],
             :flatnode_file => node[:nominatim][:flatnode_file],
             :log_file => "#{node[:nominatim][:logdir]}/query.log",
-            :tokenizer => node[:nominatim][:config][:tokenizer]
+            :tokenizer => node[:nominatim][:config][:tokenizer],
+            :forward_dependencies => node[:nominatim][:config][:forward_dependencies]
 end
 
 %w[wikimedia-importance.sql.gz gb_postcodes.csv.gz us_postcodes.csv.gz].each do |fname|
diff --git a/cookbooks/nominatim/templates/default/nominatim.env.erb b/cookbooks/nominatim/templates/default/nominatim.env.erb
index aca17fdd5..239208500 100644
--- a/cookbooks/nominatim/templates/default/nominatim.env.erb
+++ b/cookbooks/nominatim/templates/default/nominatim.env.erb
@@ -12,6 +12,7 @@ NOMINATIM_IMPORT_STYLE=extratags
 NOMINATIM_USE_US_TIGER_DATA=yes
 
 NOMINATIM_TOKENIZER="<%= @tokenizer %>"
+NOMINATIM_UPDATE_FORWARD_DEPENDENCIES="<%= @forward_dependencies %>"
 
 NOMINATIM_TABLESPACE_SEARCH_DATA=dsearch
 NOMINATIM_TABLESPACE_SEARCH_INDEX=isearch