X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=Makefile;h=5b780181cfbf66e38a4063d8026fd69e462f1c18;hb=622f474ca1ea97a07e872299dff9a1c0241f441f;hp=7905503ef7c82f1859720ca3cc525738dceaa884;hpb=0699cf2fb98a25aaeadb598f1a6309686b6e62c2;p=mirror%2Fdsa-nagios.git

diff --git a/Makefile b/Makefile
index 7905503..5b78018 100644
--- a/Makefile
+++ b/Makefile
@@ -5,16 +5,16 @@ generated/nrpe_dsa.cfg: nagios-master.cfg build-nagios
 	./build-nagios
 
 
-deb: generated/nrpe_dsa.cfg
+deb: generated/nrpe_dsa.cfg dsa-nagios-nrpe-config/debian/changelog
 	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,17 +27,21 @@ 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
 	install -m 644 generated/auto-hosts.cfg /etc/nagios3/conf.d
 	install -m 644 generated/auto-serviceextinfo.cfg /etc/nagios3/conf.d
 	install -m 644 generated/auto-services.cfg /etc/nagios3/conf.d
+	install -m 644 generated/auto-servicegroups.cfg /etc/nagios3/conf.d
 	#
 	@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 " cp Build-tree/*.deb /org/db.debian.org/ftp-archive/archive/pool/etch/ && "
+	@echo "   make -C /org/db.debian.org/ftp-archive"
 	#
 	@echo
 	#