diff options
| author | Erik Johnston <erik@matrix.org> | 2019-09-26 17:14:23 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-09-26 17:14:23 +0100 |
| commit | 6d0f559fb34907ef73ed1e7e57c1a117a2b98107 (patch) | |
| tree | 78f19bb401551d7595b13b754ec228c57fc4041f | |
| parent | s/month/week/ to match config (diff) | |
| parent | Newsfile (diff) | |
| download | synapse-6d0f559fb34907ef73ed1e7e57c1a117a2b98107.tar.xz | |
Merge pull request #6117 from matrix-org/erikj/fix_sample_config
Fix 'redaction_retention_period' sampel config to match guidelines
| -rw-r--r-- | changelog.d/6117.misc | 1 | ||||
| -rw-r--r-- | docs/sample_config.yaml | 2 | ||||
| -rw-r--r-- | synapse/config/server.py | 2 |
3 files changed, 3 insertions, 2 deletions
diff --git a/changelog.d/6117.misc b/changelog.d/6117.misc new file mode 100644 index 0000000000..f8bdb58f41 --- /dev/null +++ b/changelog.d/6117.misc @@ -0,0 +1 @@ +Fix up sample config entry for `redaction_retention_period` option. diff --git a/docs/sample_config.yaml b/docs/sample_config.yaml index 254e1b17b4..43893399ad 100644 --- a/docs/sample_config.yaml +++ b/docs/sample_config.yaml @@ -314,7 +314,7 @@ listeners: # # Defaults to `7d`. Set to `null` to disable. # -redaction_retention_period: 7d +#redaction_retention_period: 28d # How long to track users' last seen time and IPs in the database. # diff --git a/synapse/config/server.py b/synapse/config/server.py index 5ad7ee911d..536ee7f29c 100644 --- a/synapse/config/server.py +++ b/synapse/config/server.py @@ -742,7 +742,7 @@ class ServerConfig(Config): # # Defaults to `7d`. Set to `null` to disable. # - redaction_retention_period: 7d + #redaction_retention_period: 28d # How long to track users' last seen time and IPs in the database. # |