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

[slicer-guest at alioth.debian.org]

Author: slicer-guest
Date: Fri Aug 15 13:36:31 2008
New Revision: 6035

URL: http://svn.debian.org/wsvn/pkg-voip/?sc=1&rev=6035
Log:
* Add README and README.Linux to mumble.docs
* Revert to asking for server password, as you currently can't change
  the password once it's set.

Added:
    mumble/trunk/debian/mumble.docs
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=6035&op=diff
==============================================================================
--- mumble/trunk/debian/changelog (original)
+++ mumble/trunk/debian/changelog Fri Aug 15 13:36:31 2008
@@ -1,3 +1,11 @@
+mumble (1.1.4-4) UNRELEASED; urgency=low
+
+  * Add README and README.Linux to mumble.docs
+  * Revert to asking for server password, as you currently can't change
+    the password once it's set.
+
+ -- Thorvald Natvig <thorvald at debian.localdomain>  Fri, 15 Aug 2008 14:53:19 +0200
+
 mumble (1.1.4-3) unstable; urgency=low
 
   [ Thorvald Natvig ]

Modified: mumble/trunk/debian/mumble-server.config
URL: http://svn.debian.org/wsvn/pkg-voip/mumble/trunk/debian/mumble-server.config?rev=6035&op=diff
==============================================================================
--- mumble/trunk/debian/mumble-server.config (original)
+++ mumble/trunk/debian/mumble-server.config Fri Aug 15 13:36:31 2008
@@ -21,12 +21,7 @@
 
 db_input medium mumble-server/start_daemon || true
 db_input medium mumble-server/emailfrom || 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 medium mumble-server/password || true
-fi
+db_input medium mumble-server/password || true
 
 db_go
 

Modified: mumble/trunk/debian/mumble-server.postinst
URL: http://svn.debian.org/wsvn/pkg-voip/mumble/trunk/debian/mumble-server.postinst?rev=6035&op=diff
==============================================================================
--- mumble/trunk/debian/mumble-server.postinst (original)
+++ mumble/trunk/debian/mumble-server.postinst Fri Aug 15 13:36:31 2008
@@ -71,15 +71,11 @@
 		# likely to update it outside of debconf.
 		db_get mumble-server/password
 		if [ "X$RET" != "X" ] ; then
-			if [ $RET = "X" ] ; then
-				echo "A password has been set."
+			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 ""
 			else
-				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
+				echo "Failed to set SuperUser password." >&2
 			fi
 		fi
 		db_stop

Added: mumble/trunk/debian/mumble.docs
URL: http://svn.debian.org/wsvn/pkg-voip/mumble/trunk/debian/mumble.docs?rev=6035&op=file
==============================================================================
--- mumble/trunk/debian/mumble.docs (added)
+++ mumble/trunk/debian/mumble.docs Fri Aug 15 13:36:31 2008
@@ -1,0 +1,2 @@
+README
+README.Linux