Make the energy_perf_bias configuration actually work

[chef.git] / 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 596a4dd7da5763a329fc01c27c5af9edcf2c3925..5353d69d42daa35841e7f0c3deb7a516af662250 100755 (executable)
--- a/cookbooks/dns/templates/default/dns-update.erb
+++ b/cookbooks/dns/templates/default/dns-update.erb
@@ -4,17 +4,22 @@
 
 umask 0002
 
 
 umask 0002
 

-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

 
 cd /var/lib/dns
 
 
 cd /var/lib/dns
 

+lockfile-create --use-pid update || exit 1
+

 if [ ! -d .git ]
 then
 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
 
 fi
 
 git pull -q
 

-make update
+make --jobs update
+
+lockfile-remove update