Merge remote-tracking branch 'github/pull/350' into master

[chef.git] / cookbooks / nominatim / templates / default / git-post-merge-hook.erb

diff --git a/cookbooks/nominatim/templates/default/git-post-merge-hook.erb b/cookbooks/nominatim/templates/default/git-post-merge-hook.erb
index dbd3ddbdd09cc8aa3579cb567a8fe635dd8bc493..9c20abaca0f13cad279ccda0a5687d09cb5ee7b2 100644 (file)
--- a/cookbooks/nominatim/templates/default/git-post-merge-hook.erb
+++ b/cookbooks/nominatim/templates/default/git-post-merge-hook.erb
@@ -14,4 +14,6 @@ make
 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
 fi