tileradotorg/synapse
1
0
Fork 0
forked from MirrorHub/synapse
Code Pull requests Activity

Only generate configuration files when necessary

Browse source
This commit is contained in:
kaiyou 2018-02-05 22:57:35 +01:00
parent 630573a932
commit ee3b160a2a
1 changed files with 7 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
contrib/docker/start.py
View file

@ -26,16 +26,18 @@ for secret in ("SYNAPSE_REGISTRATION_SHARED_SECRET", "SYNAPSE_MACAROON_SECRET_KE
print("Generating a random secret for {}".format(secret)) print("Generating a random secret for {}".format(secret))
environ[secret] = os.urandom(32).encode("hex") environ[secret] = os.urandom(32).encode("hex")
# Parse the configuration file
if not os.path.exists("/compiled"): os.mkdir("/compiled")
convert("/conf/homeserver.yaml", "/compiled/homeserver.yaml", environ)
convert("/conf/log.config", "/compiled/%s.log.config" % environ.get("SYNAPSE_SERVER_NAME"), environ)
# In generate mode, generate a configuration, missing keys, then exit # In generate mode, generate a configuration, missing keys, then exit
if mode == "generate": if mode == "generate":
os.execv("/usr/local/bin/python", args + ["--generate-config"]) os.execv("/usr/local/bin/python", args + ["--generate-config"])
# In normal mode, generate missing keys if any, then run synapse # In normal mode, generate missing keys if any, then run synapse
else: else:
# Parse the configuration file
if "SYNAPSE_CONFIG_PATH" not in environ:
if not os.path.exists("/compiled"): os.mkdir("/compiled")
convert("/conf/homeserver.yaml", "/compiled/homeserver.yaml", environ)
convert("/conf/log.config", "/compiled/%s.log.config" % environ.get("SYNAPSE_SERVER_NAME"), environ)
# Generate missing keys and start synapse
subprocess.check_output(args + ["--generate-keys"]) subprocess.check_output(args + ["--generate-keys"])
subprocess.check_output(["chown", "-R", permissions, "/data"]) subprocess.check_output(["chown", "-R", permissions, "/data"])
os.execv("/sbin/su-exec", ["su-exec", permissions] + args) os.execv("/sbin/su-exec", ["su-exec", permissions] + args)