nominatim: deploy code from a tag

diff --git a/cookbooks/nominatim/attributes/default.rb b/cookbooks/nominatim/attributes/default.rb
index 1f5a1560bed05dbf37a6569f9328239f8908b8d4..26fe1c8a64000aaad354f20ae76535bd28bebef1 100644 (file)
--- a/cookbooks/nominatim/attributes/default.rb
+++ b/cookbooks/nominatim/attributes/default.rb
@@ -6,7 +6,7 @@ default[:nominatim][:tablespaces] = []
 default[:nominatim][:postgis] = "3"
 default[:nominatim][:logdir] = "/var/log/nominatim"
 default[:nominatim][:repository] = "https://git.openstreetmap.org/public/nominatim.git"
-default[:nominatim][:revision] = "master"
+default[:nominatim][:revision] = "origin/master"
 default[:nominatim][:enable_backup] = false
 default[:nominatim][:enable_git_updates] = true
 default[:nominatim][:enable_qa_tiles] = false

diff --git a/cookbooks/nominatim/templates/default/nominatim-update-source.erb b/cookbooks/nominatim/templates/default/nominatim-update-source.erb
index 5074b237e3a9667955bab0099aea6c23ddc55f0c..70b6402a809b4d2bb1f59e4c1bb7d1f2febe76a2 100644 (file)
--- a/cookbooks/nominatim/templates/default/nominatim-update-source.erb
+++ b/cookbooks/nominatim/templates/default/nominatim-update-source.erb
@@ -10,12 +10,12 @@ cd <%= @srcdir %>
 
 git fetch origin
 
-if git diff --exit-code origin/<%= node[:nominatim][:revision] %> >/dev/null; then
+if git diff --exit-code <%= node[:nominatim][:revision] %> >/dev/null; then
   # signal that there are no new updates
   exit 99
 fi
 
-git merge origin/<%= node[:nominatim][:revision] %>
+git checkout --detach <%= node[:nominatim][:revision] %>
 git submodule update
 
 cd <%= @builddir %>

diff --git a/roles/nominatim.rb b/roles/nominatim.rb
index e79a7fce2bb141ce63c3d4a690f255cfa931134d..4cef80bf6c5a94386acd04a1948b7879c3fc707f 100644 (file)
--- a/roles/nominatim.rb
+++ b/roles/nominatim.rb
@@ -65,6 +65,7 @@ default_attributes(
   },
   :nominatim => {
     :dbadmins => %w[lonvia tomh],
+    :revision => "deploy",
     :tablespaces => {
       "dosm" => "/ssd/tablespaces/dosm",
       "iosm" => "/ssd/tablespaces/iosm",