Skip to content
Permalink
Browse files

Update murmur.ini and scripts to disable dbus by default and enable ice.

Fixes #1083
  • Loading branch information...
hacst committed Sep 25, 2014
1 parent a61d67d commit bc11185427db7e8484948d8158aa827d730c901b
Showing with 3 additions and 10 deletions.
  1. +0 −1 scripts/mkini-win32.bat
  2. +1 −7 scripts/mkini.sh
  3. +2 −2 scripts/murmur.ini
@@ -1,4 +1,3 @@
copy murmur.ini murmur.ini.win32

perl -pi.bak -e "s,^(#|)ice=,ice=," murmur.ini.win32

@@ -4,13 +4,7 @@ cp murmur.ini murmur.ini.win32
cp murmur.ini murmur.ini.osx
cp murmur.ini murmur.ini.system

perl -pi.bak -e 's!^(#|)ice=!ice=!' murmur.ini.win32

perl -pi.bak -e 's!^(#|)ice=!ice=!' murmur.ini.osx
perl -pi.bak -e 's!^(#|)dbus=!#dbus!' murmur.ini.osx

perl -pi.bak -e 's!^(#|)ice=!ice=!' murmur.ini.system
perl -pi.bak -e 's/^(#|)dbus=.*$/dbus=system/' murmur.ini.system
perl -pi.bak -e 's/^(#|)dbus=.*$/\1dbus=system/' murmur.ini.system
perl -pi.bak -e 's/^(#|)logfile=.*$/logfile=\/var\/log\/mumble-server\/mumble-server.log/' murmur.ini.system
perl -pi.bak -e 's/^(#|)pidfile=.*$/pidfile=\/var\/run\/mumble-server\/mumble-server.pid/' murmur.ini.system
perl -pi.bak -e 's/^(#|)database=.*$/database=\/var\/lib\/mumble-server\/mumble-server.sqlite/' murmur.ini.system
@@ -31,7 +31,7 @@ database=
# Murmur defaults to not using D-Bus. If you wish to use dbus, which is one of the
# RPC methods available in Murmur, please specify so here.
#
dbus=session
#dbus=session

# Alternate D-Bus service name. Only use if you are running distinct
# murmurd processes connected to the same D-Bus daemon.
@@ -42,7 +42,7 @@ dbus=session
# with ICE, you should only use it if you trust all the users who have
# shell access to your machine.
# Please see the ICE documentation on how to specify endpoints.
#ice="tcp -h 127.0.0.1 -p 6502"
ice="tcp -h 127.0.0.1 -p 6502"

# Ice primarily uses local sockets. This means anyone who has a
# user account on your machine can connect to the Ice services.

0 comments on commit bc11185

Please sign in to comment.
You can’t perform that action at this time.