Now links users to mumble, and check_user works with virtual servers

This commit is contained in:
2010-03-23 10:17:00 +00:00
parent 9503dd12f6
commit 05f5df397c
2 changed files with 7 additions and 3 deletions

View File

@@ -112,9 +112,9 @@ JABBER_AUTH_PASSWD = 'pepperllama34'
### Mumble Service Settings ### Mumble Service Settings
DEFAULT_CONN = 'Meta:tcp -h 127.0.0.1 -p 6502' DEFAULT_CONN = 'Meta:tcp -h 127.0.0.1 -p 6502'
MUMBLE_DEFAULT_PORT = 64738 MUMBLE_DEFAULT_PORT = 64740
SLICE = 'Murmur.ice' SLICE = 'Murmur.ice'
MUMBLE_SERVER_ID = 1 MUMBLE_SERVER_ID = 2
### Wiki Service Settings ### Wiki Service Settings

View File

@@ -18,13 +18,17 @@ class MumbleService(BaseService):
mumbleuser.name = username mumbleuser.name = username
mumbleuser.password = password mumbleuser.password = password
mumbleuser.server = self._get_server() mumbleuser.server = self._get_server()
if 'user' in kwargs:
mumbleuser.user = kwargs['user']
mumbleuser.save() mumbleuser.save()
return mumbleuser.name return mumbleuser.name
def check_user(self, username): def check_user(self, username):
""" Check if the username exists """ """ Check if the username exists """
try: try:
mumbleuser = MumbleUser.objects.get(name=username) mumbleuser = MumbleUser.objects.get(name=username, server=self._get_server())
except MumbleUser.DoesNotExist: except MumbleUser.DoesNotExist:
return False return False
else: else: