Update board wiki to 1.37

[chef.git] / cookbooks / nominatim / templates / default / updater.erb

diff --git a/cookbooks/nominatim/templates/default/updater.erb b/cookbooks/nominatim/templates/default/updater.erb
index ade5845aa6fda850f5d16801cef83c1afb012d3e..d3fd0d937d62aac5838ad8cce1c36d1027ca013a 100644 (file)
--- a/cookbooks/nominatim/templates/default/updater.erb
+++ b/cookbooks/nominatim/templates/default/updater.erb
@@ -17,12 +17,12 @@ do
 
     if [[ $current_load -lt $num_cpus ]]
     then
-        INST=2
+        INST=4
     else
-        INST=1
+        INST=2
     fi
 
-    ./utils/update.php --import-osmosis --index-instances $INST
+    ./nominatim replication --once --threads $INST
 
 <% if node[:nominatim][:enable_git_updates] -%>
     pushd <%= @srcdir %>
@@ -37,6 +37,17 @@ do
 
     if [ -f "<%= @update_maintenance_trigger %>" ]; then
         rm <%= @update_maintenance_trigger %>
-        ./utils/update.php --calculate-postcodes
+        ./nominatim refresh --postcodes --threads 4 -v
+<% if node[:nominatim][:enable_qa_tiles] -%>
+        pushd <%= @qabindir %>
+        if python3 cli.py --execute-all; then
+          rm -rf "<%= @qadatadir %>/old"
+          if [ -d "<%= @qadatadir %>/current" ]; then
+            mv "<%= @qadatadir %>/current" "<%= @qadatadir %>/old"
+          fi
+          mv "<%= @qadatadir %>/new" "<%= @qadatadir %>/current"
+        fi
+        popd
+<% end -%>
     fi
 done