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

Fix 'redaction_retention_period' sampel config to match guidelines
matrix-org · Sep 26, 2019 · 6d0f559 · 6d0f559
2 parents f25c5ee + 9d99ead
commit 6d0f559
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 2 deletions.
diff --git a/changelog.d/6117.misc 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
@@ -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
@@ -742,7 +742,7 @@ def generate_config_section(
         #
         # 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.
         #