[Pkg-nagios-changes] [pkg-nagios] r1085 - nagios/trunk/debian

[Sean Finney]

Author: seanius
Date: 2006-12-10 14:28:01 +0100 (Sun, 10 Dec 2006)
New Revision: 1085

Modified:
   nagios/trunk/debian/changelog
   nagios/trunk/debian/nagios-mysql.postinst
   nagios/trunk/debian/nagios-pgsql.postinst
Log:
ucf fixes

Modified: nagios/trunk/debian/changelog
===================================================================
--- nagios/trunk/debian/changelog	2006-12-10 09:35:04 UTC (rev 1084)
+++ nagios/trunk/debian/changelog	2006-12-10 13:28:01 UTC (rev 1085)
@@ -14,8 +14,10 @@
     the follow-up consultation.  existing nagios-pgsql users: see NEWS.Debian.
     (closes: #401155).
     patch: 17_create_pgsql-oids.dpatch
-  * properly purge the ucf information for database.cfg for nagios-pgsql
-    and nagios-mysql
+  * okay, so we're not using database.cfg at all and storing the db
+    config in cgi.cfg directly, so stop generating database.cfg.  thanks
+    to Enrico Cherubini for this and sorry for the confusion :)
+    (closes: #374090).
 
  -- sean finney <seanius at debian.org>  Sun, 10 Dec 2006 10:34:57 +0100
 

Modified: nagios/trunk/debian/nagios-mysql.postinst
===================================================================
--- nagios/trunk/debian/nagios-mysql.postinst	2006-12-10 09:35:04 UTC (rev 1084)
+++ nagios/trunk/debian/nagios-mysql.postinst	2006-12-10 13:28:01 UTC (rev 1085)
@@ -3,36 +3,25 @@
 # dbconfig-common related stuff
 . /usr/share/debconf/confmodule
 . /usr/share/dbconfig-common/dpkg/postinst.mysql
-dbc_generate_include="template:/etc/nagios/database.cfg"
-dbc_generate_include_args="-C# -O nagios:www-data -m 640 -o template_infile=/usr/share/nagios/debian/database.cfg"
+dbc_generate_include="template:/etc/nagios/cgi.cfg"
+dbc_generate_include_args="-C# -O nagios:www-data -m 640 -o template_infile=/usr/share/nagios/debian/cgi.cfg.dbconfig -U"
 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"
-
 case "$1" in
 configure|upgrade)
-	# dbconfigurate the cgi file, additionally.
-	# oy.  now that's a command.
-	dbconfig-generate-include -f template -C'#' \
-	                          -o template_infile="$cgi_template" \
-	                          -O nagios:www-data -m 640 -U \
-	                          /etc/dbconfig-common/nagios-mysql.conf \
-							  /etc/nagios/cgi.cfg
-;;
+	# manually start nagios here instead of in -common.
+	if [ -x "/etc/init.d/nagios" ]; then
+		update-rc.d nagios defaults 30 18 >/dev/null
+		if [ -x "`which invoke-rc.d 2>/dev/null`" ]; then
+			invoke-rc.d nagios start || exit 0
+		else
+			/etc/init.d/nagios start || exit 0
+		fi
+	fi
+	;;
 esac
 
-# manually start nagios here instead of in -common.
-if [ -x "/etc/init.d/nagios" ]; then
-	update-rc.d nagios defaults 30 18 >/dev/null
-	if [ -x "`which invoke-rc.d 2>/dev/null`" ]; then
-		invoke-rc.d nagios start || exit 0
-	else
-		/etc/init.d/nagios start || exit 0
-	fi
-fi
-
 #DEBHELPER#

Modified: nagios/trunk/debian/nagios-pgsql.postinst
===================================================================
--- nagios/trunk/debian/nagios-pgsql.postinst	2006-12-10 09:35:04 UTC (rev 1084)
+++ nagios/trunk/debian/nagios-pgsql.postinst	2006-12-10 13:28:01 UTC (rev 1085)
@@ -4,37 +4,25 @@
 # dbconfig-common related stuff
 . /usr/share/debconf/confmodule
 . /usr/share/dbconfig-common/dpkg/postinst.pgsql
-dbc_generate_include="template:/etc/nagios/database.cfg"
-dbc_generate_include_args="-C# -O nagios:www-data -m 640 -o template_infile=/usr/share/nagios/debian/database.cfg"
+dbc_generate_include="template:/etc/nagios/cgi.cfg"
+dbc_generate_include_args="-C# -O nagios:www-data -m 640 -o template_infile=/usr/share/nagios/debian/cgi.cfg.dbconfig -U"
 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"
-
 case "$1" in
 configure|upgrade)
-	# dbconfigurate the cgi file, additionally.
-	# oy.  now that's a command.
-	dbconfig-generate-include -f template -C'#' \
-	                          -o template_infile="$cgi_template" \
-	                          -O nagios:www-data -m 640 -U \
-	                          /etc/dbconfig-common/nagios-pgsql.conf \
-							  /etc/nagios/cgi.cfg
-;;
+	# manually start nagios here instead of in -common.
+	if [ -x "/etc/init.d/nagios" ]; then
+		update-rc.d nagios defaults 30 18 >/dev/null
+		if [ -x "`which invoke-rc.d 2>/dev/null`" ]; then
+			invoke-rc.d nagios start || exit 0
+		else
+			/etc/init.d/nagios start || exit 0
+		fi
+	fi
+	;;
 esac
 
-# manually start nagios here instead of in -common.
-if [ -x "/etc/init.d/nagios" ]; then
-	update-rc.d nagios defaults 30 18 >/dev/null
-	if [ -x "`which invoke-rc.d 2>/dev/null`" ]; then
-		invoke-rc.d nagios start || exit 0
-	else
-		/etc/init.d/nagios start || exit 0
-	fi
-fi
-
-
 #DEBHELPER#