From 3d343431248fb196b4c26c77f84020f24996df42 Mon Sep 17 00:00:00 2001 From: Michael Ziegler Date: Sun, 5 Dec 2010 14:50:08 +0100 Subject: [PATCH] add SLICEDIR config option to set the slice include dir if it can't be discovered (debian Lenny). fixes #122 --- pyweb/mumble/MumbleCtlIce.py | 5 ++++- pyweb/settings.py | 8 ++++++++ 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/pyweb/mumble/MumbleCtlIce.py b/pyweb/mumble/MumbleCtlIce.py index dfbb3c1..37caa48 100644 --- a/pyweb/mumble/MumbleCtlIce.py +++ b/pyweb/mumble/MumbleCtlIce.py @@ -37,7 +37,10 @@ def loadSlice( slicefile ): if hasattr( Ice, "getSliceDir" ): icepath = Ice.getSliceDir() else: - icepath = None + from django.conf import settings + icepath = settings.SLICEDIR + if not exists( join( icepath, "Ice", "SliceChecksumDict.ice" ) ): + icepath = None if not icepath: # last resort, let's hope to christ this works (won't for >=1.2.3) diff --git a/pyweb/settings.py b/pyweb/settings.py index 64ebd2b..6c7753e 100644 --- a/pyweb/settings.py +++ b/pyweb/settings.py @@ -22,8 +22,16 @@ ## The slice to use for communication over ZeroC Ice. ## ## This must be set to the path to the Murmur.ice file that ## ## resides in your Murmur directory. ## +## Not used on recent Murmur versions, because the slice file ## +## can be retrieved from Murmur directly. ## SLICE = '/usr/share/slice/Murmur.ice' ## ## ## +## The include dir to pass to Ice. Set this to a path in which ## +## $SLICEDIR/Ice/SliceChecksumDict.ice exists. ## +## Not used on recent Ice versions, because the SLICEDIR can ## +## be retrieved from Ice directly. ## +SLICEDIR = '/usr/share/slice' ## +## ## ################################################################# ## ## ## The path inside the VirtualHost that M-D lives in: ##