OpenCloud
/
MatrixSynapse
mirror of https://github.com/matrix-org/synapse
1
0
Fork 0
Code Issues Releases Wiki Activity

Merge pull request #6117 from matrix-org/erikj/fix_sample_config 

Fix 'redaction_retention_period' sampel config to match guidelines
pull/6135/head
Erik Johnston 2019-09-26 17:14:23 +01:00 committed by GitHub
parent f25c5ee1fe 9d99eade7c
commit 6d0f559fb3
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
changelog.d/6117.misc Normal file
View File

@ -0,0 +1 @@
Fix up sample config entry for `redaction_retention_period` option.

2
docs/sample_config.yaml
View File

@ -314,7 +314,7 @@ listeners:
# #
# Defaults to `7d`. Set to `null` to disable. # 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. # How long to track users' last seen time and IPs in the database.
# #

2
synapse/config/server.py
View File

@ -742,7 +742,7 @@ class ServerConfig(Config):
# #
# Defaults to `7d`. Set to `null` to disable. # 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. # How long to track users' last seen time and IPs in the database.
# #