summary refs log tree commit diff
path: root/docker/start.py
diff options
context:
space:
mode:
authorBruno Windels <brunow@matrix.org>2018-09-27 19:18:38 +0100
committerBruno Windels <brunow@matrix.org>2018-09-27 19:18:38 +0100
commitc5e1de677d137f0effe24a82c3c1846d60e72a9f (patch)
tree65d232f95219430c735d4864533515c354669702 /docker/start.py
parentadd changelog (diff)
parentMerge pull request #3794 from matrix-org/erikj/faster_typing (diff)
downloadsynapse-github/bwindels/registerasregularuser.tar.xz
Merge branch 'develop' into bwindels/registerasregularuser github/bwindels/registerasregularuser bwindels/registerasregularuser
Diffstat (limited to 'docker/start.py')
-rwxr-xr-xdocker/start.py3
1 files changed, 2 insertions, 1 deletions
diff --git a/docker/start.py b/docker/start.py

index 90e8b9c51a..346df8c87f 100755 --- a/docker/start.py +++ b/docker/start.py
@@ -5,6 +5,7 @@ import os import sys import subprocess import glob +import codecs # Utility functions convert = lambda src, dst, environ: open(dst, "w").write(jinja2.Template(open(src).read()).render(**environ)) @@ -23,7 +24,7 @@ def generate_secrets(environ, secrets): with open(filename) as handle: value = handle.read() else: print("Generating a random secret for {}".format(name)) - value = os.urandom(32).encode("hex") + value = codecs.encode(os.urandom(32), "hex").decode() with open(filename, "w") as handle: handle.write(value) environ[secret] = value