X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=config%2FMakefile;h=69e64c723abc783011df8f0761954071d210a138;hb=64868915d7e83b0d60f8fc7786a7a0ba5930b452;hp=38388bd9ac43846442b957aad32571149002e868;hpb=b4e26e1d5fc7418b454b40542f6f9c8d3a64e660;p=mirror%2Fdsa-nagios.git

diff --git a/config/Makefile b/config/Makefile
index 38388bd..69e64c7 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 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
+	@rsync -avHz --delete-before --ignore-errors -e 'ssh -i /var/lib/puppet/.ssh/id_rsa.puppet-sync' generated static nagiosadm@tchaikovsky.debian.org:/srv/nagios.debian.org/config-pushed/.
+	@ssh -i /var/lib/puppet/.ssh/id_rsa.puppet-sync nagiosadm@tchaikovsky.debian.org icinga-reload
 
 .PHONY: all deb