X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=config%2FMakefile;h=8697b02a104f1cd3f047d087a9719a3d44a91987;hb=4b93c82f0bfb726242324294207abf254694b81e;hp=682fa73933a60e4c24f7837c325281c0313602f9;hpb=ede0186255eac8f6035f498ea1d754504bd545b5;p=mirror%2Fdsa-nagios.git

diff --git a/config/Makefile b/config/Makefile
index 682fa73..8697b02 100644
--- a/config/Makefile
+++ b/config/Makefile
@@ -3,7 +3,7 @@ all: generated/nrpe_dsa.cfg deb
 generated/nrpe_dsa.cfg: nagios-master.cfg build-nagios
 	@[ -d generated ] || mkdir generated
 	@echo "building nagios ..."
-	./build-nagios || rm $@
+	./build-nagios || ( rm $@ ; false )
 	@echo "done"
 
 clean:
@@ -11,7 +11,9 @@ clean:
 
 install: generated/nrpe_dsa.cfg
 	@[ "$$(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 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