diff options
| author | Stefan Hacker <dd0t@users.sourceforge.net> | 2014-09-26 00:55:39 +0400 |
|---|---|---|
| committer | Stefan Hacker <dd0t@users.sourceforge.net> | 2014-09-26 01:08:42 +0400 |
| commit | bc11185427db7e8484948d8158aa827d730c901b (patch) | |
| tree | 753524ad4f0781611448469afff092fbb439ff11 /scripts | |
| parent | a61d67d62756fc6cd7c7e48566536e6c8b6695bb (diff) | |
Update murmur.ini and scripts to disable dbus by default and enable ice.
Fixes #1083
Diffstat (limited to 'scripts')
| -rwxr-xr-x | scripts/mkini-win32.bat | 1 | ||||
| -rwxr-xr-x | scripts/mkini.sh | 8 | ||||
| -rw-r--r-- | scripts/murmur.ini | 4 |
3 files changed, 3 insertions, 10 deletions
diff --git a/scripts/mkini-win32.bat b/scripts/mkini-win32.bat index 652117073..ceaa2c7d0 100755 --- a/scripts/mkini-win32.bat +++ b/scripts/mkini-win32.bat @@ -1,4 +1,3 @@ copy murmur.ini murmur.ini.win32 -perl -pi.bak -e "s,^(#|)ice=,ice=," murmur.ini.win32 diff --git a/scripts/mkini.sh b/scripts/mkini.sh index c507f0d0a..cd4e6cd43 100755 --- a/scripts/mkini.sh +++ b/scripts/mkini.sh @@ -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 diff --git a/scripts/murmur.ini b/scripts/murmur.ini index 12f61a2f8..98ccc43a3 100644 --- a/scripts/murmur.ini +++ b/scripts/murmur.ini @@ -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. |