[Pkg-nagios-changes] nagios nagios-mysql.postinst, 1.1, 1.2 nagios-pgsql.postinst, 1.1, 1.2 nagios-pgsql.prerm, 1.1, 1.2 rules, 1.22, 1.23

[seanius at haydn.debian.org]

Update of /cvsroot/pkg-nagios/nagios
In directory haydn:/org/alioth.debian.org/chroot/home/users/seanius/tmp/cvs-serv5148

Modified Files:
	nagios-mysql.postinst nagios-pgsql.postinst nagios-pgsql.prerm 
	rules 
Log Message:
a couple other odds and ends.  postgres works! w00t.


Index: nagios-mysql.postinst
===================================================================
RCS file: /cvsroot/pkg-nagios/nagios/nagios-mysql.postinst,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- nagios-mysql.postinst	8 Dec 2005 13:12:23 -0000	1.1
+++ nagios-mysql.postinst	8 Dec 2005 14:33:42 -0000	1.2
@@ -7,6 +7,8 @@
 dbc_generate_include_args="-C# -O nagios:www-data -m 640 -o template_infile=/usr/share/nagios/debian/database.cfg"
 dbc_first_version="2:1.3-cvs.20050402-11"
 dbc_go nagios-mysql $@
+# manually stop debconf here, since we're starting a daemon later
+db_stop
 
 # additionally, we need to manage a second configuration file:
 cgi_template="/usr/share/nagios/debian/cgi.cfg.dbconfig"

Index: nagios-pgsql.postinst
===================================================================
RCS file: /cvsroot/pkg-nagios/nagios/nagios-pgsql.postinst,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- nagios-pgsql.postinst	8 Dec 2005 13:12:23 -0000	1.1
+++ nagios-pgsql.postinst	8 Dec 2005 14:33:42 -0000	1.2
@@ -8,6 +8,8 @@
 dbc_generate_include_args="-C# -O nagios:www-data -m 640 -o template_infile=/usr/share/nagios/debian/database.cfg"
 dbc_first_version="2:1.3-cvs.20050402-11"
 dbc_go nagios-pgsql $@
+# manually stop debconf here, since we're starting a daemon later
+db_stop
 
 # additionally, we need to manage a second configuration file:
 cgi_template="/usr/share/nagios/debian/cgi.cfg.dbconfig"
@@ -34,4 +36,5 @@
 	fi
 fi
 
+
 #DEBHELPER#

Index: nagios-pgsql.prerm
===================================================================
RCS file: /cvsroot/pkg-nagios/nagios/nagios-pgsql.prerm,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- nagios-pgsql.prerm	8 Dec 2005 13:12:23 -0000	1.1
+++ nagios-pgsql.prerm	8 Dec 2005 14:33:42 -0000	1.2
@@ -1,16 +1,19 @@
 #!/bin/sh -e
 
-. /usr/share/debconf/confmodule
-. /usr/share/dbconfig-common/dpkg/prerm.pgsql
-dbc_go nagios-pgsql $@
-
 # manually stop nagios here instead of in -common
 if [ -x "/etc/init.d/nagios" ]; then
 	if [ -x "`which invoke-rc.d 2>/dev/null`" ]; then
-		invoke-rc.d nagios stop || exit 0
+		invoke-rc.d nagios stop >&2 || exit 0
 	else
-		/etc/init.d/nagios stop || exit 0
+		/etc/init.d/nagios stop >&2 || exit 0
 	fi
 fi
 
+# do the dbconfig-common stuff after this, because otherwise the
+# postgres server will not let us drop the database if the admin
+# chooses to do so.
+. /usr/share/debconf/confmodule
+. /usr/share/dbconfig-common/dpkg/prerm.pgsql
+dbc_go nagios-pgsql $@
+
 #DEBHELPER#

Index: rules
===================================================================
RCS file: /cvsroot/pkg-nagios/nagios/rules,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -d -r1.22 -r1.23
--- rules	8 Dec 2005 13:12:23 -0000	1.22
+++ rules	8 Dec 2005 14:33:42 -0000	1.23
@@ -197,6 +197,7 @@
 	dh_compress          -p$@ -P$(b)/$@
 	dh_fixperms          -p$@ -P$(b)/$@
 	dh_installdeb        -p$@ -P$(b)/$@
+	dh_installdebconf    -p$@ -P$(b)/$@
 	dh_shlibdeps         -p$@ -P$(b)/$@
 	dh_gencontrol        -p$@ -P$(b)/$@
 	dh_makeshlibs        -p$@ -P$(b)/$@ -V