Merge remote-tracking branch 'github/pull/711'

[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 621cbd6f93905b4b6cd1cf4d4d356db253928cd9..09f061b67db9c420872c7cac08093edfe1cd97f8 100755 (executable)
--- a/cookbooks/dns/templates/default/dns-check.erb
+++ b/cookbooks/dns/templates/default/dns-check.erb
@@ -1,10 +1,12 @@
 #!/bin/sh
 
-export RSYNC_PASSWORD="<%= @passwords["rsync"] %>"
 export GEODNS_SERVERS="<%= @geoservers.join(" ") %>"
-export PINGDOM_USERNAME="pingdom@openstreetmap.org"
-export PINGDOM_PASSWORD="<%= @passwords["pingdom"] %>"
 export STATUSCAKE_USERNAME="OpenStreetMap"
 export STATUSCAKE_APIKEY="<%= @passwords["statuscake"] %>"
+export PATH=/usr/local/bin:$PATH
 
-make --quiet --jobs --directory=/var/lib/dns --assume-new=bin/mkgeo update > /dev/null
+lockfile-create --use-pid /var/lib/dns/update || exit 1
+
+make --quiet --jobs --directory=/var/lib/dns update_primary > /dev/null
+
+lockfile-remove /var/lib/dns/update