Browse Source

add SLICEDIR config option to set the slice include dir if it can't be discovered (debian Lenny). fixes #122

Natenom/support-murmur-13-1446181288462
Michael Ziegler 14 years ago
parent
commit
3d34343124
  1. 5
      pyweb/mumble/MumbleCtlIce.py
  2. 8
      pyweb/settings.py

5
pyweb/mumble/MumbleCtlIce.py

@ -37,7 +37,10 @@ def loadSlice( slicefile ):
if hasattr( Ice, "getSliceDir" ): if hasattr( Ice, "getSliceDir" ):
icepath = Ice.getSliceDir() icepath = Ice.getSliceDir()
else: else:
icepath = None
from django.conf import settings
icepath = settings.SLICEDIR
if not exists( join( icepath, "Ice", "SliceChecksumDict.ice" ) ):
icepath = None
if not icepath: if not icepath:
# last resort, let's hope to christ this works (won't for >=1.2.3) # last resort, let's hope to christ this works (won't for >=1.2.3)

8
pyweb/settings.py

@ -22,8 +22,16 @@
## The slice to use for communication over ZeroC Ice. ## ## The slice to use for communication over ZeroC Ice. ##
## This must be set to the path to the Murmur.ice file that ## ## This must be set to the path to the Murmur.ice file that ##
## resides in your Murmur directory. ## ## 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' ## 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: ## ## The path inside the VirtualHost that M-D lives in: ##

Loading…
Cancel
Save