summary refs log tree commit diff
diff options
context:
space:
mode:
authorRichard van der Hoff <1389908+richvdh@users.noreply.github.com>2018-12-04 14:46:12 +0100
committerGitHub <noreply@github.com>2018-12-04 14:46:12 +0100
commit956061732d95c73d0aa5887df247c510025b907a (patch)
treee14bff1c1fb72a2a23d60c51bfa6b4e0a0455003
parentMerge pull request #4005 from matrix-org/michaelkaye/move_to_docker_label (diff)
parentRemove obsolete settings from docker homeserver.yaml (diff)
downloadsynapse-956061732d95c73d0aa5887df247c510025b907a.tar.xz
Merge pull request #4261 from matrix-org/rav/docker/remove_log_file
Remove obsolete settings from docker homeserver.yaml
-rw-r--r--changelog.d/4261.misc1
-rw-r--r--docker/conf/homeserver.yaml4
2 files changed, 2 insertions, 3 deletions
diff --git a/changelog.d/4261.misc b/changelog.d/4261.misc
new file mode 100644

index 0000000000..2a88c8c856 --- /dev/null +++ b/changelog.d/4261.misc
@@ -0,0 +1 @@ +Remove obsolete `verbose` and `log_file` settings from `homeserver.yaml` for Docker image. \ No newline at end of file diff --git a/docker/conf/homeserver.yaml b/docker/conf/homeserver.yaml
index d5074be6dd..c2b8576a32 100644 --- a/docker/conf/homeserver.yaml +++ b/docker/conf/homeserver.yaml
@@ -14,6 +14,7 @@ server_name: "{{ SYNAPSE_SERVER_NAME }}" pid_file: /homeserver.pid web_client: False soft_file_limit: 0 +log_config: "/compiled/log.config" ## Ports ## @@ -67,9 +68,6 @@ database: ## Performance ## event_cache_size: "{{ SYNAPSE_EVENT_CACHE_SIZE or "10K" }}" -verbose: 0 -log_file: "/data/homeserver.log" -log_config: "/compiled/log.config" ## Ratelimiting ##