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

diff --git a/config/Makefile b/config/Makefile
index 59347b6..8697b02 100644
--- a/config/Makefile
+++ b/config/Makefile
@@ -1,13 +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 generated static handel.debian.org:/etc/puppet/modules/nagios/files/dsa-nagios
+	@[ "$$(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
+