X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=config%2FMakefile;h=69e64c723abc783011df8f0761954071d210a138;hb=ae89857e4449c016a147f57490bf7de38910ecca;hp=e2d1a62d159d5d0b896b41067cee7d532b828825;hpb=0f38d806d6e295ad2bd5fdbdcec26779a02ba393;p=mirror%2Fdsa-nagios.git diff --git a/config/Makefile b/config/Makefile index e2d1a62..69e64c7 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 + ./build-nagios || ( rm $@ ; false ) @echo "done" clean: @@ -12,6 +12,8 @@ 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 -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