diff options
| author | Brendan Abolivier <babolivier@matrix.org> | 2020-01-07 15:07:19 +0000 |
|---|---|---|
| committer | Brendan Abolivier <babolivier@matrix.org> | 2020-01-07 15:07:19 +0000 |
| commit | 4be582d7c85b45d14d0320330b98c9251b3a95ed (patch) | |
| tree | 8d09864ce61b48fe5c4e44a6016713f239d667da /docs | |
| parent | Apply suggestions from code review (diff) | |
| parent | Fixup changelog (diff) | |
| download | synapse-4be582d7c85b45d14d0320330b98c9251b3a95ed.tar.xz | |
Merge branch 'develop' into babolivier/retention_doc
Diffstat (limited to 'docs')
| -rw-r--r-- | docs/sample_config.yaml | 4 | ||||
| -rw-r--r-- | docs/sample_log_config.yaml | 4 |
2 files changed, 2 insertions, 6 deletions
diff --git a/docs/sample_config.yaml b/docs/sample_config.yaml index e3b05423b8..fad5f968b5 100644 --- a/docs/sample_config.yaml +++ b/docs/sample_config.yaml @@ -692,10 +692,6 @@ media_store_path: "DATADIR/media_store" # config: # directory: /mnt/some/other/directory -# Directory where in-progress uploads are stored. -# -uploads_path: "DATADIR/uploads" - # The largest allowed upload size in bytes # #max_upload_size: 10M diff --git a/docs/sample_log_config.yaml b/docs/sample_log_config.yaml index 11e8f35f41..1a2739455e 100644 --- a/docs/sample_log_config.yaml +++ b/docs/sample_log_config.yaml @@ -1,4 +1,4 @@ -# Example log config file for synapse. +# Log configuration for Synapse. # # This is a YAML file containing a standard Python logging configuration # dictionary. See [1] for details on the valid settings. @@ -20,7 +20,7 @@ handlers: file: class: logging.handlers.RotatingFileHandler formatter: precise - filename: /home/rav/work/synapse/homeserver.log + filename: /var/log/matrix-synapse/homeserver.log maxBytes: 104857600 backupCount: 10 filters: [context] |