[Pkg-voip-commits] r5682 - in /mumble/trunk/debian: changelog mumble-server.config mumble-server.init mumble-server.postinst mumble-server.postrm
the-me-guest at alioth.debian.org
the-me-guest at alioth.debian.org
Thu May 8 19:52:16 UTC 2008
Author: the-me-guest
Date: Thu May 8 19:52:15 2008
New Revision: 5682
URL: http://svn.debian.org/wsvn/pkg-voip/?sc=1&rev=5682
Log:
Changed destination of /etc/mumble-server/mumble-server.ini to
/etc/mumble-server.ini. Migration script still has to be done.
Modified:
mumble/trunk/debian/changelog
mumble/trunk/debian/mumble-server.config
mumble/trunk/debian/mumble-server.init
mumble/trunk/debian/mumble-server.postinst
mumble/trunk/debian/mumble-server.postrm
Modified: mumble/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-voip/mumble/trunk/debian/changelog?rev=5682&op=diff
==============================================================================
--- mumble/trunk/debian/changelog (original)
+++ mumble/trunk/debian/changelog Thu May 8 19:52:15 2008
@@ -7,6 +7,8 @@
* Removed the sed hack from debian/rules. It is fixed in qmake now.
* Removed some whitespaces at EOL and newlines at EOF.
* Some clean target fixes.
+ * Changed destination of /etc/mumble-server/mumble-server.ini to
+ /etc/mumble-server.ini.
[ Debian l10n ]
* French translation from Steve Petruzzello <dlist at bluewin.ch>.
Modified: mumble/trunk/debian/mumble-server.config
URL: http://svn.debian.org/wsvn/pkg-voip/mumble/trunk/debian/mumble-server.config?rev=5682&op=diff
==============================================================================
--- mumble/trunk/debian/mumble-server.config (original)
+++ mumble/trunk/debian/mumble-server.config Thu May 8 19:52:15 2008
@@ -16,8 +16,8 @@
fi
fi
-if [ -f /etc/mumble-server/mumble-server.ini ] ; then
- EMAILFROM=`perl -ne 'if (/^emailfrom\s*=\s*(.+)\s*$/) { print $1 ; }' /etc/mumble-server/mumble-server.ini`
+if [ -f /etc/mumble-server.ini ] ; then
+ EMAILFROM=`perl -ne 'if (/^emailfrom\s*=\s*(.+)\s*$/) { print $1 ; }' /etc/mumble-server.ini`
db_set mumble-server/emailfrom "$EMAILFROM"
fi
Modified: mumble/trunk/debian/mumble-server.init
URL: http://svn.debian.org/wsvn/pkg-voip/mumble/trunk/debian/mumble-server.init?rev=5682&op=diff
==============================================================================
--- mumble/trunk/debian/mumble-server.init (original)
+++ mumble/trunk/debian/mumble-server.init Thu May 8 19:52:15 2008
@@ -22,7 +22,7 @@
test -x $DAEMON || exit 0
-INIFILE=/etc/mumble-server/mumble-server.ini
+INIFILE=/etc/mumble-server.ini
DAEMON_OPTS="-ini $INIFILE"
MURMUR_DAEMON_START=0
Modified: mumble/trunk/debian/mumble-server.postinst
URL: http://svn.debian.org/wsvn/pkg-voip/mumble/trunk/debian/mumble-server.postinst?rev=5682&op=diff
==============================================================================
--- mumble/trunk/debian/mumble-server.postinst (original)
+++ mumble/trunk/debian/mumble-server.postinst Thu May 8 19:52:15 2008
@@ -36,9 +36,9 @@
fi
}
-CONF="/etc/mumble-server/mumble-server.ini"
-CONF_NEW="/etc/mumble-server/mumble-server.ini.new"
-CONF_OLD="/etc/mumble-server/mumble-server.ini.old"
+CONF="/etc/mumble-server.ini"
+CONF_NEW="/etc/mumble-server.ini.new"
+CONF_OLD="/etc/mumble-server.ini.old"
TEMPLATE="/usr/share/mumble-server/templates/murmur.ini.system"
do_configuration;
CONF="/etc/dbus-1/system.d/murmur.conf"
@@ -77,21 +77,21 @@
echo "/etc/default/mumble-server not found, configuration failed." >&2
fi
- # Update /etc/mumble-server/mumble-server.ini based on config
- if [ -f /etc/mumble-server/mumble-server.ini ] ; then
+ # Update /etc/mumble-server.ini based on config
+ if [ -f /etc/mumble-server.ini ] ; then
db_get mumble-server/emailfrom
if [ "X$RET" != "X" ] ; then
- if grep -E '^.*emailfrom[[:space:]]*=' /etc/mumble-server/mumble-server.ini > /dev/null; then
- perl -pi -w -e "BEGIN { \$email = '$RET'; } s/^.*emailfrom\\s*=.*$/emailfrom = \$email/g" /etc/mumble-server/mumble-server.ini
+ if grep -E '^.*emailfrom[[:space:]]*=' /etc/mumble-server.ini > /dev/null; then
+ perl -pi -w -e "BEGIN { \$email = '$RET'; } s/^.*emailfrom\\s*=.*$/emailfrom = \$email/g" /etc/mumble-server.ini
else
- echo "emailfrom = $RET" >> /etc/mumble-server/mumble-server.ini
- echo "Warning: /etc/mumble-server/mumble-server.ini looks damaged" >&2
+ echo "emailfrom = $RET" >> /etc/mumble-server.ini
+ echo "Warning: /etc/mumble-server.ini looks damaged" >&2
fi
else
- perl -pi -w -e "s/^.*emailfrom\\s*=.*$/#emailfrom =/g" /etc/mumble-server/mumble-server.ini
+ perl -pi -w -e "s/^.*emailfrom\\s*=.*$/#emailfrom =/g" /etc/mumble-server.ini
fi
else
- echo "/etc/mumble-server/mumble-server.ini not found, configuration failed." >&2
+ echo "/etc/mumble-server.ini not found, configuration failed." >&2
fi
# Update SuperUser password based on config.
@@ -99,7 +99,7 @@
# likely to update it outside of debconf.
db_get mumble-server/password
if [ "X$RET" != "X" ] ; then
- su mumble-server -s /bin/sh -c "/usr/sbin/murmurd -ini /etc/mumble-server/mumble-server.ini -supw \"$RET\""
+ su mumble-server -s /bin/sh -c "/usr/sbin/murmurd -ini /etc/mumble-server.ini -supw \"$RET\""
if [ $? = 0 ] ; then
db_set mumble-server/password ""
else
Modified: mumble/trunk/debian/mumble-server.postrm
URL: http://svn.debian.org/wsvn/pkg-voip/mumble/trunk/debian/mumble-server.postrm?rev=5682&op=diff
==============================================================================
--- mumble/trunk/debian/mumble-server.postrm (original)
+++ mumble/trunk/debian/mumble-server.postrm Thu May 8 19:52:15 2008
@@ -23,7 +23,7 @@
[ -d /var/lib/mumble-server/.config ] && rm -rf /var/lib/mumble-server/.config
[ -f /var/run/mumble-server/mumble-server.pid ] && rm -f /var/run/mumble-server/mumble-server.pid
[ -d /var/run/mumble-server ] && rmdir --ignore-fail-on-non-empty /var/run/mumble-server
- [ -f /etc/mumble-server/mumble-server.ini ] && rm -f /etc/mumble-server/mumble-server.ini
+ [ -f /etc/mumble-server.ini ] && rm -f /etc/mumble-server.ini
[ -f /etc/dbus-1/system.d/murmur.conf ] && rm -f /etc/dbus-1/system.d/murmur.conf
if [ -x "$(command -v deluser)" ] ; then
More information about the Pkg-voip-commits
mailing list