X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=Makefile;h=e96b28d9c39437417e8554fb3d97203dd40f98b0;hb=9af0885b2e0133112c0306ed37352245abe181f5;hp=82ca8dde018984e2a3cf79bd094fa2a4e1307322;hpb=039b61f659d1da833c9e8a9ec396b155a129612a;p=mirror%2Fdsa-nagios.git

diff --git a/Makefile b/Makefile
index 82ca8dd..e96b28d 100644
--- a/Makefile
+++ b/Makefile
@@ -9,12 +9,12 @@ deb: generated/nrpe_dsa.cfg
 	if ! [ -e Build-tree/dsa-nagios-nrpe-config/nrpe_dsa.cfg ] || \
 	   ! diff generated/nrpe_dsa.cfg Build-tree/dsa-nagios-nrpe-config/nrpe_dsa.cfg > /dev/null; then \
 		cp -a generated/nrpe_dsa.cfg dsa-nagios-nrpe-config && \
-		cd dsa-nagios-nrpe-config && dch -i "Automatically generated new version." && cd .. && \
-		bzr ci -m 'Automatically generated new version' dsa-nagios-nrpe-config/debian/changelog && \
 		rm -rf Build-tree && \
 		mkdir Build-tree && \
 		cp -av dsa-nagios-nrpe-config Build-tree && \
-		cd Build-tree/dsa-nagios-nrpe-config && debuild -rfakeroot -uc -us; \
+		cd Build-tree/dsa-nagios-nrpe-config && \
+			dch --newversion "$$(date --utc '+%Y%m%dT%H%M%S')" "Built on `hostname` in `pwd` by $$USER." && \
+			debuild -rfakeroot -uc -us; \
 	fi
 
 clean:
@@ -27,6 +27,10 @@ install: generated/nrpe_dsa.cfg
 	#
 	install -m 644 checkcommands.cfg /etc/nagios-plugins/config/local-dsa-checkcommands.cfg
 	#
+	install -m 644 nagios-conf/contacs.cfg /etc/nagios3/conf.d
+	install -m 644 nagios-conf/generic-host.cfg /etc/nagios3/conf.d
+	install -m 644 nagios-conf/generic-service.cfg /etc/nagios3/conf.d
+	install -m 644 nagios-conf/timeperiods.cfg /etc/nagios3/conf.d
 	install -m 644 generated/auto-dependencies.cfg /etc/nagios3/conf.d
 	install -m 644 generated/auto-hostextinfo.cfg /etc/nagios3/conf.d
 	install -m 644 generated/auto-hostgroups.cfg /etc/nagios3/conf.d
@@ -37,7 +41,7 @@ install: generated/nrpe_dsa.cfg
 	@echo "Also run: "
 	@echo " cp Build-tree/*.deb /var/www/userdir-ldap/debian-admin &&"
 	@echo "   cd /var/www/userdir-ldap/debian-admin &&"
-	@echo "   ./zzzz_rebuild_index_here"
+	@echo "   ./zzzz_rebuild_index_here && cd -"
 	#
 	@echo
 	#