[Pkg-nagios-changes] [pkg-nagios] r1638 - nagios3/trunk/debian

[Alexander Wirt]

Author: formorer
Date: 2009-03-21 13:50:41 +0000 (Sat, 21 Mar 2009)
New Revision: 1638

Modified:
   nagios3/trunk/debian/changelog
   nagios3/trunk/debian/nagios3-common.config
Log:
Only ask for a password if no config exists


Modified: nagios3/trunk/debian/changelog
===================================================================
--- nagios3/trunk/debian/changelog	2009-03-21 13:35:38 UTC (rev 1637)
+++ nagios3/trunk/debian/changelog	2009-03-21 13:50:41 UTC (rev 1638)
@@ -13,6 +13,8 @@
     (Closes: #495245)
   * Move homedirectory of the nagios user to /var/lib/nagios 
     (Closes: #500709)
+  * Adjust priority to htpass question to high 
+
  -- Alexander Wirt <formorer at debian.org>  Sat, 21 Mar 2009 09:00:47 +0100
 
 nagios3 (3.0.6-3) unstable; urgency=low

Modified: nagios3/trunk/debian/nagios3-common.config
===================================================================
--- nagios3/trunk/debian/nagios3-common.config	2009-03-21 13:35:38 UTC (rev 1637)
+++ nagios3/trunk/debian/nagios3-common.config	2009-03-21 13:50:41 UTC (rev 1638)
@@ -46,6 +46,8 @@
 	# however, they are left in the "seen" state so that the
 	# admin is not prompted for them at every upgrade.
 	while [ ! "$passwordsmatch" ]; do
+		#only ask for a password if no htpasswd exists
+		test -f htpasswd.users && break 
 		db_input high nagios3/adminpassword || true
 		db_input high nagios3/adminpassword-repeat || true
 		db_go || true