|
@@ -188,11 +188,6 @@ def main(args, environ):
|
|
|
else:
|
|
|
ownership = "{}:{}".format(desired_uid, desired_gid)
|
|
|
|
|
|
- log(
|
|
|
- "Container running as UserID %s:%s, ENV (or defaults) requests %s:%s"
|
|
|
- % (os.getuid(), os.getgid(), desired_uid, desired_gid)
|
|
|
- )
|
|
|
-
|
|
|
if ownership is None:
|
|
|
log("Will not perform chmod/su-exec as UserID already matches request")
|
|
|
|
|
@@ -213,38 +208,30 @@ def main(args, environ):
|
|
|
if mode is not None:
|
|
|
error("Unknown execution mode '%s'" % (mode,))
|
|
|
|
|
|
- if "SYNAPSE_SERVER_NAME" in environ:
|
|
|
- # backwards-compatibility generate-a-config-on-the-fly mode
|
|
|
- if "SYNAPSE_CONFIG_PATH" in environ:
|
|
|
+ config_dir = environ.get("SYNAPSE_CONFIG_DIR", "/data")
|
|
|
+ config_path = environ.get("SYNAPSE_CONFIG_PATH", config_dir + "/homeserver.yaml")
|
|
|
+
|
|
|
+ if not os.path.exists(config_path):
|
|
|
+ if "SYNAPSE_SERVER_NAME" in environ:
|
|
|
error(
|
|
|
- "SYNAPSE_SERVER_NAME can only be combined with SYNAPSE_CONFIG_PATH "
|
|
|
- "in `generate` or `migrate_config` mode. To start synapse using a "
|
|
|
- "config file, unset the SYNAPSE_SERVER_NAME environment variable."
|
|
|
+ """\
|
|
|
+Config file '%s' does not exist.
|
|
|
+
|
|
|
+The synapse docker image no longer supports generating a config file on-the-fly
|
|
|
+based on environment variables. You can migrate to a static config file by
|
|
|
+running with 'migrate_config'. See the README for more details.
|
|
|
+"""
|
|
|
+ % (config_path,)
|
|
|
)
|
|
|
|
|
|
- config_path = "/compiled/homeserver.yaml"
|
|
|
- log(
|
|
|
- "Generating config file '%s' on-the-fly from environment variables.\n"
|
|
|
- "Note that this mode is deprecated. You can migrate to a static config\n"
|
|
|
- "file by running with 'migrate_config'. See the README for more details."
|
|
|
+ error(
|
|
|
+ "Config file '%s' does not exist. You should either create a new "
|
|
|
+ "config file by running with the `generate` argument (and then edit "
|
|
|
+ "the resulting file before restarting) or specify the path to an "
|
|
|
+ "existing config file with the SYNAPSE_CONFIG_PATH variable."
|
|
|
% (config_path,)
|
|
|
)
|
|
|
|
|
|
- generate_config_from_template("/compiled", config_path, environ, ownership)
|
|
|
- else:
|
|
|
- config_dir = environ.get("SYNAPSE_CONFIG_DIR", "/data")
|
|
|
- config_path = environ.get(
|
|
|
- "SYNAPSE_CONFIG_PATH", config_dir + "/homeserver.yaml"
|
|
|
- )
|
|
|
- if not os.path.exists(config_path):
|
|
|
- error(
|
|
|
- "Config file '%s' does not exist. You should either create a new "
|
|
|
- "config file by running with the `generate` argument (and then edit "
|
|
|
- "the resulting file before restarting) or specify the path to an "
|
|
|
- "existing config file with the SYNAPSE_CONFIG_PATH variable."
|
|
|
- % (config_path,)
|
|
|
- )
|
|
|
-
|
|
|
log("Starting synapse with config file " + config_path)
|
|
|
|
|
|
args = ["python", "-m", synapse_worker, "--config-path", config_path]
|