|
|
@ -17,6 +17,7 @@ def provisionUserData(relay, alias, nick, altnick, ident, realname, password):
|
|
|
|
def provisionNetworkData(relay, alias, network, host, port, security, auth, password):
|
|
|
|
def provisionNetworkData(relay, alias, network, host, port, security, auth, password):
|
|
|
|
commands = {}
|
|
|
|
commands = {}
|
|
|
|
stage2commands = {}
|
|
|
|
stage2commands = {}
|
|
|
|
|
|
|
|
stage3commands = {}
|
|
|
|
commands["controlpanel"] = []
|
|
|
|
commands["controlpanel"] = []
|
|
|
|
commands["controlpanel"].append("AddNetwork %s %s" % (alias, network))
|
|
|
|
commands["controlpanel"].append("AddNetwork %s %s" % (alias, network))
|
|
|
|
if security == "ssl":
|
|
|
|
if security == "ssl":
|
|
|
@ -35,7 +36,12 @@ def provisionNetworkData(relay, alias, network, host, port, security, auth, pass
|
|
|
|
stage2commands["nickserv"] = []
|
|
|
|
stage2commands["nickserv"] = []
|
|
|
|
stage2commands["status"].append("LoadMod NickServ")
|
|
|
|
stage2commands["status"].append("LoadMod NickServ")
|
|
|
|
stage2commands["nickserv"].append("Set %s" % password)
|
|
|
|
stage2commands["nickserv"].append("Set %s" % password)
|
|
|
|
deliverRelayCommands(relay, commands, stage2=[[alias+"/"+network, stage2commands]])
|
|
|
|
if not main.config["ConnectOnCreate"]:
|
|
|
|
|
|
|
|
stage3commands["status"] = []
|
|
|
|
|
|
|
|
stage3commands["status"].append("Disconnect")
|
|
|
|
|
|
|
|
deliverRelayCommands(relay, commands,
|
|
|
|
|
|
|
|
stage2=[[alias+"/"+network, stage2commands],
|
|
|
|
|
|
|
|
[alias+"/"+network, stage3commands]])
|
|
|
|
return
|
|
|
|
return
|
|
|
|
|
|
|
|
|
|
|
|
def provisionRelayForAlias(relay, alias):
|
|
|
|
def provisionRelayForAlias(relay, alias):
|
|
|
@ -54,7 +60,7 @@ def provisionRelayForAlias(relay, alias):
|
|
|
|
return True
|
|
|
|
return True
|
|
|
|
|
|
|
|
|
|
|
|
def provisionRelayForNetwork(relay, alias, network):
|
|
|
|
def provisionRelayForNetwork(relay, alias, network):
|
|
|
|
if all([x in ["users", "networks"] for x in main.relay[relay].keys() if x in ["users", "networks"]]):
|
|
|
|
if set(["users", "networks"]).issubset(main.relay[relay].keys()):
|
|
|
|
if network in main.relay[relay]["networks"] and alias in main.relay[relay]["users"]:
|
|
|
|
if network in main.relay[relay]["networks"] and alias in main.relay[relay]["users"]:
|
|
|
|
return "PROVISIONED"
|
|
|
|
return "PROVISIONED"
|
|
|
|
else:
|
|
|
|
else:
|
|
|
@ -87,8 +93,6 @@ def provisionRelayForNetwork(relay, alias, network):
|
|
|
|
main.saveConf("pool")
|
|
|
|
main.saveConf("pool")
|
|
|
|
if main.config["ConnectOnCreate"]:
|
|
|
|
if main.config["ConnectOnCreate"]:
|
|
|
|
startBot(network+i)
|
|
|
|
startBot(network+i)
|
|
|
|
else:
|
|
|
|
|
|
|
|
deliverRelayCommands(relay, {"status": ["Disconnect"]}, user=alias+"/"+network)
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
storedNetwork = True
|
|
|
|
storedNetwork = True
|
|
|
|
return network+i
|
|
|
|
return network+i
|
|
|
|