diff options
| author | Erik Johnston <erik@matrix.org> | 2014-08-24 12:17:59 +0100 |
|---|---|---|
| committer | Erik Johnston <erik@matrix.org> | 2014-08-24 12:17:59 +0100 |
| commit | 4521c2d277fd56e505f28ebf372d204c52a4f979 (patch) | |
| tree | 73d30c9aaa8c99a7f6ba18eb3f23b5521bb3d1b2 /synapse/app/homeserver.py | |
| parent | oops (diff) | |
| parent | For the content repo, don't just use homeserver.hostname as that might not in... (diff) | |
| download | synapse-4521c2d277fd56e505f28ebf372d204c52a4f979.tar.xz | |
Merge branch 'hotfixes-0.0.1' of github.com:matrix-org/synapse
Diffstat (limited to 'synapse/app/homeserver.py')
| -rwxr-xr-x | synapse/app/homeserver.py | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/synapse/app/homeserver.py b/synapse/app/homeserver.py index 495149466c..40e3561ee5 100755 --- a/synapse/app/homeserver.py +++ b/synapse/app/homeserver.py @@ -37,6 +37,7 @@ import logging import logging.config import sqlite3 import os +import re logger = logging.getLogger(__name__) @@ -255,8 +256,14 @@ def setup(): logger.info("Server hostname: %s", args.host) + if re.search(":[0-9]+$", args.host): + domain_with_port = args.host + else: + domain_with_port = "%s:%s" % (args.host, args.port) + hs = SynapseHomeServer( args.host, + domain_with_port=domain_with_port, upload_dir=os.path.abspath("uploads"), db_name=db_name, ) |