Wrap DNS updates with a lock to avoid conflicts

[chef.git] / cookbooks / dns / templates / default / dns-check.erb

diff --git a/cookbooks/dns/templates/default/dns-check.erb b/cookbooks/dns/templates/default/dns-check.erb
index 24fc320e2fc1ce368d25ddb5fe2b6f29e78c6626..00b97aa60d31e908973ef5ba3e8f35bd316a4bf4 100755 (executable)
--- a/cookbooks/dns/templates/default/dns-check.erb
+++ b/cookbooks/dns/templates/default/dns-check.erb
@@ -1,7 +1,12 @@
 #!/bin/sh
 
-export RSYNC_PASSWORD=<%= @passwords["rsync"] %>
-export PINGDOM_USERNAME=pingdom@openstreetmap.org
-export PINGDOM_PASSWORD=<%= @passwords["pingdom"] %>
+export GEODNS_SERVERS="<%= @geoservers.join(" ") %>"
+export STATUSCAKE_USERNAME="OpenStreetMap"
+export STATUSCAKE_APIKEY="<%= @passwords["statuscake"] %>"
+export PATH=/usr/local/bin:$PATH
 
-make --quiet --directory=/var/lib/dns --assume-new=lib/countries.xml update > /dev/null
+lockfile-create --use-pid /var/lib/dns/update || exit 1
+
+make --quiet --jobs --directory=/var/lib/dns update > /dev/null
+
+lockfile-remove /var/lib/dns/update