[Pkg-voip-commits] r5971 - in /mumble/trunk/debian: changelog mumble-server.config mumble-server.postinst

[the-me-guest at alioth.debian.org]

Author: the-me-guest
Date: Sun Jul 20 13:25:12 2008
New Revision: 5971

URL: http://svn.debian.org/wsvn/pkg-voip/?sc=1&rev=5971
Log:
* Add my forgotten signature in the 1.1.4-1 changelog, it was confusing.
* Only ask for the serverpassword if no previous one has been set.

Modified:
    mumble/trunk/debian/changelog
    mumble/trunk/debian/mumble-server.config
    mumble/trunk/debian/mumble-server.postinst

Modified: mumble/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-voip/mumble/trunk/debian/changelog?rev=5971&op=diff
==============================================================================
--- mumble/trunk/debian/changelog (original)
+++ mumble/trunk/debian/changelog Sun Jul 20 13:25:12 2008
@@ -1,6 +1,11 @@
 mumble (1.1.4-3) UNRELEASED; urgency=low
 
+  [ Thorvald Natvig ]
   * Fix ownership of /var/run/mumble-server so the pid file can be written.
+
+  [ Patrick Matthäi ]
+  * Add my forgotten signature in the 1.1.4-1 changelog, it was confusing.
+  * Only ask for the serverpassword if no previous one has been set.
 
  -- Thorvald Natvig <slicer at users.sourceforge.net>  Sun, 20 Jul 2008 13:48:43 +0200
 
@@ -22,6 +27,7 @@
 
 mumble (1.1.4-1) unstable; urgency=low
 
+  [ Patrick Matthäi ]
   * New upstream release.
     - Removed dpatch and all patches. They are merged in upstream.
     - Define the Plugin Path and added liblink plugin for mumble.

Modified: mumble/trunk/debian/mumble-server.config
URL: http://svn.debian.org/wsvn/pkg-voip/mumble/trunk/debian/mumble-server.config?rev=5971&op=diff
==============================================================================
--- mumble/trunk/debian/mumble-server.config (original)
+++ mumble/trunk/debian/mumble-server.config Sun Jul 20 13:25:12 2008
@@ -3,8 +3,6 @@
 set -e
 
 . /usr/share/debconf/confmodule
-
-db_set mumble-server/password ""
 
 if [ -f /etc/default/mumble-server ] ; then
 	MURMUR_DAEMON_START=0
@@ -23,7 +21,13 @@
 
 db_input medium mumble-server/start_daemon || true
 db_input medium mumble-server/emailfrom || true
-db_input high mumble-server/password || true
+
+# Only ask for the password if it hasn't been setted in the past.
+db_get mumble-server/password || true
+if [ "$RET" != "X" ] ; then
+	db_input high mumble-server/password || true
+fi
+
 db_go
 
 #DEBHELPER#

Modified: mumble/trunk/debian/mumble-server.postinst
URL: http://svn.debian.org/wsvn/pkg-voip/mumble/trunk/debian/mumble-server.postinst?rev=5971&op=diff
==============================================================================
--- mumble/trunk/debian/mumble-server.postinst (original)
+++ mumble/trunk/debian/mumble-server.postinst Sun Jul 20 13:25:12 2008
@@ -71,11 +71,15 @@
 		# likely to update it outside of debconf.
 		db_get mumble-server/password
 		if [ "X$RET" != "X" ] ; then
-			echo $RET | su mumble-server -s /bin/sh -c "/usr/sbin/murmurd -ini /etc/mumble-server.ini -readsupw"
-			if [ $? = 0 ] ; then
-				db_set mumble-server/password ""
+			if [ $RET = "X" ] ; then
+				echo "A password has been set."
 			else
-				echo "Failed to set SuperUser password." >&2
+				echo $RET | su mumble-server -s /bin/sh -c "/usr/sbin/murmurd -ini /etc/mumble-server.ini -readsupw"
+				if [ $? = 0 ] ; then
+					db_set mumble-server/password "X"
+				else
+					echo "Failed to set SuperUser password." >&2
+				fi
 			fi
 		fi
 		db_stop