diff options
| author | Andrew Morgan <andrew@amorgan.xyz> | 2020-02-25 17:58:12 +0000 |
|---|---|---|
| committer | Andrew Morgan <andrew@amorgan.xyz> | 2020-02-25 17:58:12 +0000 |
| commit | 6e620befc719ba4f8eaf4d1d269517480570b8b3 (patch) | |
| tree | 865dcea48e94969070f00a1cacb03a84806366fe | |
| parent | Kill off half-implemented password-reset via sms (#6101) (diff) | |
| parent | Merge pull request #6117 from matrix-org/erikj/fix_sample_config (diff) | |
| download | synapse-6e620befc719ba4f8eaf4d1d269517480570b8b3.tar.xz | |
Merge pull request #6117 from matrix-org/erikj/fix_sample_config
| -rw-r--r-- | CHANGES.md | 4 | ||||
| -rw-r--r-- | changelog.d/6117.misc | 1 | ||||
| -rw-r--r-- | docs/sample_config.yaml | 2 | ||||
| -rw-r--r-- | synapse/config/server.py | 2 |
4 files changed, 5 insertions, 4 deletions
diff --git a/CHANGES.md b/CHANGES.md index addc4c4b56..0a0d0b3439 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -2,7 +2,7 @@ Synapse 1.4.0rc1 (2019-09-26) ============================= Note that this release includes significant changes around 3pid -verification. Administrators are reminded to review the [upgrade notes](UPGRADE.rst##upgrading-to-v140). +verification. Administrators are reminded to review the [upgrade notes](UPGRADE.rst#upgrading-to-v140). Features -------- @@ -48,7 +48,7 @@ Features - Let synctl accept a directory of config files. ([\#5904](https://github.com/matrix-org/synapse/issues/5904)) - Increase max display name size to 256. ([\#5906](https://github.com/matrix-org/synapse/issues/5906)) - Add admin API endpoint for getting whether or not a user is a server administrator. ([\#5914](https://github.com/matrix-org/synapse/issues/5914)) -- Redact events in the database that have been redacted for a month. ([\#5934](https://github.com/matrix-org/synapse/issues/5934)) +- Redact events in the database that have been redacted for a week. ([\#5934](https://github.com/matrix-org/synapse/issues/5934)) - New prometheus metrics: - `synapse_federation_known_servers`: represents the total number of servers your server knows about (i.e. is in rooms with), including itself. Enable by setting `metrics_flags.known_servers` to True in the configuration.([\#5981](https://github.com/matrix-org/synapse/issues/5981)) - `synapse_build_info`: exposes the Python version, OS version, and Synapse version of the running server. ([\#6005](https://github.com/matrix-org/synapse/issues/6005)) 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 6d637eda20..3fc0ac2e5a 100644 --- a/docs/sample_config.yaml +++ b/docs/sample_config.yaml @@ -389,7 +389,7 @@ retention: # # 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 2ac6576f62..6eddb588c4 100644 --- a/synapse/config/server.py +++ b/synapse/config/server.py @@ -947,7 +947,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. # |