summary refs log tree commit diff
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2019-09-09 13:40:05 +0100
committerErik Johnston <erik@matrix.org>2019-09-09 13:55:28 +0100
commit8b9ade8c7871c862cf2122a156f00e411cd7a276 (patch)
treecb8d04088089842ab0b2455712fe1e8ab099beae
parentUse better names in SQL (diff)
downloadsynapse-8b9ade8c7871c862cf2122a156f00e411cd7a276.tar.xz
Default to censoring redactions after seven days
-rw-r--r--docs/sample_config.yaml8
-rw-r--r--synapse/config/server.py10
2 files changed, 11 insertions, 7 deletions
diff --git a/docs/sample_config.yaml b/docs/sample_config.yaml
index e23b80d2b8..24adc3da2f 100644
--- a/docs/sample_config.yaml
+++ b/docs/sample_config.yaml
@@ -306,10 +306,12 @@ listeners:
 #
 #allow_per_room_profiles: false
 
-# How long to keep redacted events in unredacted form in the database.
-# By default redactions are kept indefinitely.
+# How long to keep redacted events in unredacted form in the database. After
+# this period redacted events get replaced with their redacted form in the DB.
 #
-#redaction_retention_period: 30d
+# Defaults to `7d`. Set to `null` to disable.
+#
+redaction_retention_period: 7d
 
 
 ## TLS ##
diff --git a/synapse/config/server.py b/synapse/config/server.py
index aa71835dc3..c8b9fe2d0f 100644
--- a/synapse/config/server.py
+++ b/synapse/config/server.py
@@ -164,7 +164,7 @@ class ServerConfig(Config):
 
         # How long to keep redacted events in the database in unredacted form
         # before redacting them.
-        redaction_retention_period = config.get("redaction_retention_period")
+        redaction_retention_period = config.get("redaction_retention_period", "7d")
         if redaction_retention_period is not None:
             self.redaction_retention_period = self.parse_duration(
                 redaction_retention_period
@@ -729,10 +729,12 @@ class ServerConfig(Config):
         #
         #allow_per_room_profiles: false
 
-        # How long to keep redacted events in unredacted form in the database.
-        # By default redactions are kept indefinitely.
+        # How long to keep redacted events in unredacted form in the database. After
+        # this period redacted events get replaced with their redacted form in the DB.
         #
-        #redaction_retention_period: 30d
+        # Defaults to `7d`. Set to `null` to disable.
+        #
+        redaction_retention_period: 7d
         """
             % locals()
         )