X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;ds=sidebyside;f=config%2FMakefile;h=682fa73933a60e4c24f7837c325281c0313602f9;hb=ede0186255eac8f6035f498ea1d754504bd545b5;hp=b4472c8fe36bc345df814167754f37841f3e9df8;hpb=79f7551746b63532239bbee0f3f8ed50fc28b974;p=mirror%2Fdsa-nagios.git

diff --git a/config/Makefile b/config/Makefile
index b4472c8..682fa73 100644
--- a/config/Makefile
+++ b/config/Makefile
@@ -1,13 +1,17 @@
 all: generated/nrpe_dsa.cfg deb
 
 generated/nrpe_dsa.cfg: nagios-master.cfg build-nagios
-	[ -d generated ] || mkdir generated
-	./build-nagios
+	@[ -d generated ] || mkdir generated
+	@echo "building nagios ..."
+	./build-nagios || rm $@
+	@echo "done"
 
 clean:
-	rm -rf generated
+	@rm -rf generated
 
 install: generated/nrpe_dsa.cfg
-	rsync -Prltvz --delete generated static handel.debian.org:draghi.debian.org/nagiosconfig
+	@[ "$$(hostname -f)" = 'draghi.debian.org' ] || (echo "just git push"; exit 1)
+	@rsync -avHz --delete-before --ignore-errors -e 'ssh -t -i /var/lib/puppet/.ssh/id_rsa.puppet-sync' generated static handel.debian.org:draghi.debian.org/nagiosconfig
 
 .PHONY: all deb
+