diff options
| author | Richard van der Hoff <1389908+richvdh@users.noreply.github.com> | 2018-05-23 16:06:03 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-05-23 16:06:03 +0100 |
| commit | a0b3946fe2b45956336d3ddce97df6ad3e1bb2e0 (patch) | |
| tree | 06f1d9238ec9ea4033fd8298be6232c33078127a /synapse/config/consent_config.py | |
| parent | Use the localpart in the consent uri (diff) | |
| parent | Merge pull request #3271 from matrix-org/rav/consent_uri_in_messages (diff) | |
| download | synapse-a0b3946fe2b45956336d3ddce97df6ad3e1bb2e0.tar.xz | |
Merge branch 'release-v0.30.0' into rav/localpart_in_consent_uri
Diffstat (limited to 'synapse/config/consent_config.py')
| -rw-r--r-- | synapse/config/consent_config.py | 11 |
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 +# """ |