Add provisioning API config (ref #154)

This commit is contained in:
Tulir Asokan
2018-06-24 21:22:12 +03:00
parent 15fd394d54
commit f6923a5e1b
6 changed files with 56 additions and 8 deletions
+11 -5
View File
@@ -39,6 +39,7 @@ from .portal import init as init_portal
from .puppet import init as init_puppet
from .formatter import init as init_formatter
from .public import PublicBridgeWebsite
from .provisioning_api import ProvisioningAPI
from .context import Context
parser = argparse.ArgumentParser(
@@ -74,9 +75,9 @@ db_factory = orm.sessionmaker(bind=db_engine)
db_session = orm.scoping.scoped_session(db_factory)
Base.metadata.bind = db_engine
telethon_session_container = AlchemySessionContainer(engine=db_engine, session=db_session,
table_base=Base, table_prefix="telethon_",
manage_tables=False)
session_container = AlchemySessionContainer(engine=db_engine, session=db_session,
table_base=Base, table_prefix="telethon_",
manage_tables=False)
loop = asyncio.get_event_loop()
@@ -85,11 +86,16 @@ appserv = AppService(config["homeserver.address"], config["homeserver.domain"],
config["appservice.bot_username"], log="mau.as", loop=loop,
verify_ssl=config["homeserver.verify_ssl"])
context = Context(appserv, db_session, config, loop, None, None, telethon_session_container)
context = Context(appserv, db_session, config, loop, None, None, session_container)
if config["appservice.public.enabled"]:
public = PublicBridgeWebsite(loop)
appserv.app.add_subapp(config.get("appservice.public.prefix", "/public"), public.app)
appserv.app.add_subapp(config["appservice.public.prefix"] or "/public", public.app)
if config["appservice.provisioning.enabled"]:
provisioning_api = ProvisioningAPI(loop)
appserv.app.add_subapp(config["appservice.provisioning.prefix"] or "/_matrix/provisioning",
provisioning_api.app)
with appserv.run(config["appservice.hostname"], config["appservice.port"]) as start:
init_db(db_session)