diff options
| author | Brendan Abolivier <babolivier@matrix.org> | 2019-11-26 17:53:57 +0000 |
|---|---|---|
| committer | Brendan Abolivier <babolivier@matrix.org> | 2019-11-26 17:53:57 +0000 |
| commit | 9e937c28ee2013d01716a4647ddb8df34c7ec3cd (patch) | |
| tree | ddb7c3a62227bfa760b9c9c8fcd78359f4bc4636 /docker/start.py | |
| parent | Don't restrict the tests to v1 rooms (diff) | |
| parent | Merge pull request #6420 from matrix-org/erikj/fix_find_next_generated_user_i... (diff) | |
| download | synapse-9e937c28ee2013d01716a4647ddb8df34c7ec3cd.tar.xz | |
Merge branch 'develop' into babolivier/message_retention
Diffstat (limited to 'docker/start.py')
| -rwxr-xr-x | docker/start.py | 6 |
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) |