summary refs log tree commit diff
path: root/docker/start.py
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2019-11-20 15:17:10 +0000
committerErik Johnston <erik@matrix.org>2019-11-20 15:17:10 +0000
commit2c59eb368c4cf58ffbd4bd5717505f99f53adc91 (patch)
treed416372e06dd408b2172ab8f3f7b797cd091282c /docker/start.py
parentMerge branch 'develop' of github.com:matrix-org/synapse into matrix-org-hotfixes (diff)
parent1.6.0rc1 (diff)
downloadsynapse-2c59eb368c4cf58ffbd4bd5717505f99f53adc91.tar.xz
Merge branch 'develop' of github.com:matrix-org/synapse into matrix-org-hotfixes
Diffstat (limited to 'docker/start.py')
-rwxr-xr-xdocker/start.py6
1 files changed, 3 insertions, 3 deletions
diff --git a/docker/start.py b/docker/start.py

index 6e1cb807a1..97fd247f8f 100755 --- a/docker/start.py +++ b/docker/start.py
@@ -169,11 +169,11 @@ def run_generate_config(environ, ownership): # log("running %s" % (args, )) if ownership is not None: - args = ["su-exec", ownership] + args - os.execv("/sbin/su-exec", args) - # make sure that synapse has perms to write to the data dir. subprocess.check_output(["chown", ownership, data_dir]) + + args = ["su-exec", ownership] + args + os.execv("/sbin/su-exec", args) else: os.execv("/usr/local/bin/python", args)