Mirrors
/
synapse
mirror of https://github.com/element-hq/synapse.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Add support for SYNAPSE_CONFIG_DIR

This commit is contained in:
Richard van der Hoff 2019-06-25 18:21:32 +01:00
parent a0f2921ccf
commit 6347dc1bed
2 changed files with 5 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
docker/README.md
View File

@ -186,6 +186,8 @@ The following environment variables are supported in this mode:
* `SYNAPSE_REPORT_STATS` (mandatory, `yes` or `no`): whether to enable * `SYNAPSE_REPORT_STATS` (mandatory, `yes` or `no`): whether to enable
anonymous statistics reporting. anonymous statistics reporting.
* `SYNAPSE_CONFIG_PATH` (mandatory): path to the file to be generated. * `SYNAPSE_CONFIG_PATH` (mandatory): path to the file to be generated.
* `SYNAPSE_CONFIG_DIR`: where additional config files (such as the log config
and event signing key) will be stored. Defaults to `/data`.
* `SYNAPSE_DATA_DIR`: where the generated config will put persistent data * `SYNAPSE_DATA_DIR`: where the generated config will put persistent data
such as the datatase and media store. Defaults to `/data`. such as the datatase and media store. Defaults to `/data`.
* `UID`, `GID`: the user id and group id to use for creating the data * `UID`, `GID`: the user id and group id to use for creating the data

3
docker/start.py
View File

@ -116,6 +116,7 @@ def run_generate_config(environ, ownership):
if v not in environ: if v not in environ:
error("Environment variable '%s' is mandatory in `generate` mode." % (v,)) error("Environment variable '%s' is mandatory in `generate` mode." % (v,))
config_dir = environ.get("SYNAPSE_CONFIG_DIR", "/data")
data_dir = environ.get("SYNAPSE_DATA_DIR", "/data") data_dir = environ.get("SYNAPSE_DATA_DIR", "/data")
# make sure that synapse has perms to write to the data dir. # make sure that synapse has perms to write to the data dir.
@ -131,6 +132,8 @@ def run_generate_config(environ, ownership):
environ["SYNAPSE_REPORT_STATS"], environ["SYNAPSE_REPORT_STATS"],
"--config-path", "--config-path",
environ["SYNAPSE_CONFIG_PATH"], environ["SYNAPSE_CONFIG_PATH"],
"--config-directory",
config_dir,
"--data-directory", "--data-directory",
data_dir, data_dir,
"--generate-config", "--generate-config",