X-Git-Url: https://git.openstreetmap.org./chef.git/blobdiff_plain/403b177a953175b40f6ea6a4902dba4ec9ce51eb..b6a86046121d80e5c5076ef8482e6b13c35ecae2:/cookbooks/dns/templates/default/dns-update.erb

diff --git a/cookbooks/dns/templates/default/dns-update.erb b/cookbooks/dns/templates/default/dns-update.erb
index 162e7875e..a16016b56 100755
--- a/cookbooks/dns/templates/default/dns-update.erb
+++ b/cookbooks/dns/templates/default/dns-update.erb
@@ -4,19 +4,22 @@
 
 umask 0002
 
-export RSYNC_PASSWORD=<%= @passwords["rsync"] %>
-export PINGDOM_USERNAME=pingdom@openstreetmap.org
-export PINGDOM_PASSWORD=<%= @passwords["pingdom"] %>
-export STATUSCAKE_USERNAME=OpenStreetMap
-export STATUSCAKE_APIKEY=<%= @passwords["statuscake"] %>
+export GEODNS_SERVERS="<%= @geoservers.join(" ") %>"
+export STATUSCAKE_USERNAME="OpenStreetMap"
+export STATUSCAKE_APIKEY="<%= @passwords["statuscake"] %>"
+export PATH=/usr/local/bin:$PATH
 
 cd /var/lib/dns
 
+lockfile-create --use-pid update || exit 1
+
 if [ ! -d .git ]
 then
-  git clone /var/lib/git/dns.git /var/lib/dns
+  git clone /var/lib/git/public/dns.git /var/lib/dns
 fi
 
 git pull -q
 
-make update
+make --jobs check update
+
+lockfile-remove update