plugin account: reverted patch abd3a75d629c
This commit is contained in:
parent
e488c674a9
commit
3f0482e523
1 changed files with 1 additions and 10 deletions
|
|
@ -64,7 +64,6 @@ class PasswordsMatchingError(Exception):
|
||||||
|
|
||||||
class ProsodyRegisterProtocol(protocol.ProcessProtocol):
|
class ProsodyRegisterProtocol(protocol.ProcessProtocol):
|
||||||
""" Try to register an account with prosody """
|
""" Try to register an account with prosody """
|
||||||
prosody_gid = None
|
|
||||||
|
|
||||||
def __init__(self, password=None, deferred=None):
|
def __init__(self, password=None, deferred=None):
|
||||||
"""
|
"""
|
||||||
|
|
@ -74,14 +73,6 @@ class ProsodyRegisterProtocol(protocol.ProcessProtocol):
|
||||||
self.password = password
|
self.password = password
|
||||||
self.deferred = deferred
|
self.deferred = deferred
|
||||||
self.data = ''
|
self.data = ''
|
||||||
if ProsodyRegisterProtocol.prosody_gid is None:
|
|
||||||
try:
|
|
||||||
import grp
|
|
||||||
ProsodyRegisterProtocol.prosody_gid = grp.getgrnam("prosody").gr_gid
|
|
||||||
info("prosody gid found: %s" % ProsodyRegisterProtocol.prosody_gid)
|
|
||||||
except:
|
|
||||||
warning("Can't find prosody gid")
|
|
||||||
|
|
||||||
|
|
||||||
def connectionMade(self):
|
def connectionMade(self):
|
||||||
if self.password is None:
|
if self.password is None:
|
||||||
|
|
@ -116,7 +107,7 @@ class ProsodyRegisterProtocol(protocol.ProcessProtocol):
|
||||||
prosody_reg = ProsodyRegisterProtocol(password, d)
|
prosody_reg = ProsodyRegisterProtocol(password, d)
|
||||||
prosody_exe = join(plugin._prosody_path, plugin.getConfig('prosodyctl'))
|
prosody_exe = join(plugin._prosody_path, plugin.getConfig('prosodyctl'))
|
||||||
# TODO delete account which are not on the same host
|
# TODO delete account which are not on the same host
|
||||||
reactor.spawnProcess(prosody_reg, prosody_exe, [prosody_exe, command, "%s@%s" % (profile, plugin.getConfig('new_account_domain'))], path=plugin._prosody_path, gid=ProsodyRegisterProtocol.prosody_gid)
|
reactor.spawnProcess(prosody_reg, prosody_exe, [prosody_exe, command, "%s@%s" % (profile, plugin.getConfig('new_account_domain'))], path=plugin._prosody_path)
|
||||||
return d
|
return d
|
||||||
|
|
||||||
|
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue