OpenCloud
/
MatrixSynapse
mirror of https://github.com/matrix-org/synapse
1
0
Fork 0
Code Issues Releases Wiki Activity

Rename the permissions variable to avoid confusion

pull/2846/head
kaiyou 2018-02-08 19:50:04 +01:00
parent 58df3a8c5d
commit 084afbb6a0
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
contrib/docker/start.py
View File

@ -15,7 +15,7 @@ if "SYNAPSE_SERVER_NAME" not in environ:
print("Environment variable SYNAPSE_SERVER_NAME is mandatory, exiting.") print("Environment variable SYNAPSE_SERVER_NAME is mandatory, exiting.")
sys.exit(2) sys.exit(2)
permissions = "{}:{}".format(environ.get("UID", 991), environ.get("GID", 991)) ownership = "{}:{}".format(environ.get("UID", 991), environ.get("GID", 991))
args = ["python", "-m", "synapse.app.homeserver", args = ["python", "-m", "synapse.app.homeserver",
"--server-name", environ.get("SYNAPSE_SERVER_NAME"), "--server-name", environ.get("SYNAPSE_SERVER_NAME"),
"--report-stats", environ.get("SYNAPSE_REPORT_STATS", "no"), "--report-stats", environ.get("SYNAPSE_REPORT_STATS", "no"),
@ -43,5 +43,5 @@ else:
convert("/conf/log.config", "/compiled/%s.log.config" % environ.get("SYNAPSE_SERVER_NAME"), environ) convert("/conf/log.config", "/compiled/%s.log.config" % environ.get("SYNAPSE_SERVER_NAME"), environ)
# Generate missing keys and start synapse # 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", ownership, "/data"])
os.execv("/sbin/su-exec", ["su-exec", permissions] + args) os.execv("/sbin/su-exec", ["su-exec", ownership] + args)