nominatim: switch to using nominatim tool

diff --git a/cookbooks/nominatim/templates/default/git-post-merge-hook.erb b/cookbooks/nominatim/templates/default/git-post-merge-hook.erb
index 9c20abaca0f13cad279ccda0a5687d09cb5ee7b2..fc806f1b484408701ddfc89a0d36dd12bb97aea4 100644 (file)
--- a/cookbooks/nominatim/templates/default/git-post-merge-hook.erb
+++ b/cookbooks/nominatim/templates/default/git-post-merge-hook.erb
@@ -13,7 +13,5 @@ make
 
 psql -d <%= @dbname %> -c "SELECT version();" >/dev/null 2>&1
 if [[ "$?" == "0" ]]; then
 
 psql -d <%= @dbname %> -c "SELECT version();" >/dev/null 2>&1
 if [[ "$?" == "0" ]]; then

-  ./utils/setup.php --create-functions --create-partition-functions --enable-diff-updates
-  ./utils/setup.php --setup-website
-  ./utils/update.php --update-address-levels
+  ./nominatim refresh --functions --address-levels --website

 fi
 fi

diff --git a/cookbooks/nominatim/templates/default/updater.erb b/cookbooks/nominatim/templates/default/updater.erb
index ade5845aa6fda850f5d16801cef83c1afb012d3e..37cf8937291828771e9012f789a84cd791ee04da 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
 
     if [[ $current_load -lt $num_cpus ]]
     then

-        INST=2
+        INST=4

     else
     else

-        INST=1
+        INST=2

     fi
 
     fi
 

-    ./utils/update.php --import-osmosis --index-instances $INST
+    ./nominatim replication --once --threads $INST

 
 <% if node[:nominatim][:enable_git_updates] -%>
     pushd <%= @srcdir %>
 
 <% if node[:nominatim][:enable_git_updates] -%>
     pushd <%= @srcdir %>


@@ -37,6 +37,6 @@ do
 
     if [ -f "<%= @update_maintenance_trigger %>" ]; then
         rm <%= @update_maintenance_trigger %>
 
     if [ -f "<%= @update_maintenance_trigger %>" ]; then
         rm <%= @update_maintenance_trigger %>

-        ./utils/update.php --calculate-postcodes
+        ./nominatim refresh --postcodes

     fi
 done
     fi
 done