X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=config%2FMakefile;h=8697b02a104f1cd3f047d087a9719a3d44a91987;hb=a3e4d5ee0c9da0ac7bae1ea2b294918195cd7bee;hp=9c497811319848825a8bb06e5288bfa507813289;hpb=b932a1ba93af5c7c89d146b75fa295d3b007dd3f;p=mirror%2Fdsa-nagios.git

diff --git a/config/Makefile b/config/Makefile
index 9c49781..8697b02 100644
--- a/config/Makefile
+++ b/config/Makefile
@@ -1,14 +1,19 @@
 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 $@ ; false )
+	@echo "done"
 
 clean:
-	rm -rf generated
+	@rm -rf generated
 
 install: generated/nrpe_dsa.cfg
-	rsync -Prltvz --delete -e 'ssh -i /var/lib/puppet/.ssh/id_rsa.puppet-sync' 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 generated static puppet@handel.debian.org:draghi.debian.org/nagiosconfig
+	@rsync -avHz --delete-before --ignore-errors generated static nagiosadm@tchaikovsky.debian.org:/srv/nagios.debian.org/config-pushed/.
+	@ssh nagiosadm@tchaikovsky.debian.org icinga-reload
 
 .PHONY: all deb