Browse Source

allow the ice secret to be passed to syncdb via an envvar

Natenom/support-murmur-13-1446181288462
Michael Ziegler 14 years ago
parent
commit
b619d49c31
  1. 6
      pyweb/mumble/management/server_detect.py

6
pyweb/mumble/management/server_detect.py

@ -52,8 +52,11 @@ def find_existing_instances( **kwargs ):
triedEnviron = False triedEnviron = False
online = False online = False
while not online: while not online:
env_icesecret = None
if not triedEnviron and 'MURMUR_CONNSTR' in os.environ: if not triedEnviron and 'MURMUR_CONNSTR' in os.environ:
dbusName = os.environ['MURMUR_CONNSTR'] dbusName = os.environ['MURMUR_CONNSTR']
if 'MURMUR_ICESECRET' in os.environ:
env_icesecret = os.environ['MURMUR_ICESECRET']
triedEnviron = True triedEnviron = True
if v > 1: if v > 1:
print "Trying environment setting", dbusName print "Trying environment setting", dbusName
@ -80,7 +83,10 @@ def find_existing_instances( **kwargs ):
elif dbusName == "2": elif dbusName == "2":
dbusName = "Meta:tcp -h 127.0.0.1 -p 6502" dbusName = "Meta:tcp -h 127.0.0.1 -p 6502"
if env_icesecret is None:
icesecret = getpass.getpass("Please enter the Ice secret (if any): ") icesecret = getpass.getpass("Please enter the Ice secret (if any): ")
else:
icesecret = env_icesecret
try: try:
ctl = MumbleCtlBase.newInstance( dbusName, settings.SLICE, icesecret ) ctl = MumbleCtlBase.newInstance( dbusName, settings.SLICE, icesecret )

Loading…
Cancel
Save