summary refs log tree commit diff
path: root/synapse/config
diff options
context:
space:
mode:
authorRichard van der Hoff <1389908+richvdh@users.noreply.github.com>2018-05-23 16:04:30 +0100
committerGitHub <noreply@github.com>2018-05-23 16:04:30 +0100
commit2f7008d4eb63043147d1525ad57cf5a4578dcc3b (patch)
treee8d8b097aa8f180dfc3671a4781d39aa8ab88be4 /synapse/config
parentfix typo (diff)
parentSupport for putting %(consent_uri)s in messages (diff)
downloadsynapse-2f7008d4eb63043147d1525ad57cf5a4578dcc3b.tar.xz
Merge pull request #3271 from matrix-org/rav/consent_uri_in_messages
Support for putting %(consent_uri)s in messages
Diffstat (limited to 'synapse/config')
-rw-r--r--synapse/config/consent_config.py11
1 files changed, 7 insertions, 4 deletions
diff --git a/synapse/config/consent_config.py b/synapse/config/consent_config.py
index 44c4711e6c..ddcd305f4c 100644
--- a/synapse/config/consent_config.py
+++ b/synapse/config/consent_config.py
@@ -43,10 +43,13 @@ DEFAULT_CONFIG = """\
 #   version: 1.0
 #   server_notice_content:
 #     msgtype: m.text
-#     body: |
-#       Pls do consent kthx
-#   block_events_error: |
-#     You can't send any messages until you consent to the privacy policy.
+#     body: >-
+#       To continue using this homeserver you must review and agree to the
+#       terms and conditions at %(consent_uri)s
+#   block_events_error: >-
+#     To continue using this homeserver you must review and agree to the
+#     terms and conditions at %(consent_uri)s
+#
 """