summary refs log tree commit diff
path: root/synapse/config
diff options
context:
space:
mode:
authorErik Johnston <erikj@jki.re>2018-08-24 10:10:58 +0100
committerGitHub <noreply@github.com>2018-08-24 10:10:58 +0100
commit15e8dd2ccce14cdb66dd8eaf4580290aa3c486dd (patch)
tree3feefe9c0037c421a43d862ef8699758b6cf998b /synapse/config
parentMerge pull request #3747 from matrix-org/erikj/fix_multiple_sends_notice (diff)
parentNewsfile (diff)
downloadsynapse-15e8dd2ccce14cdb66dd8eaf4580290aa3c486dd.tar.xz
Merge pull request #3749 from matrix-org/erikj/add_trial_users
Implement trial users
Diffstat (limited to 'synapse/config')
-rw-r--r--synapse/config/server.py6
1 files changed, 6 insertions, 0 deletions
diff --git a/synapse/config/server.py b/synapse/config/server.py
index 68a612e594..8eecd28e7d 100644
--- a/synapse/config/server.py
+++ b/synapse/config/server.py
@@ -77,10 +77,15 @@ class ServerConfig(Config):
             self.max_mau_value = config.get(
                 "max_mau_value", 0,
             )
+
         self.mau_limits_reserved_threepids = config.get(
             "mau_limit_reserved_threepids", []
         )
 
+        self.mau_trial_days = config.get(
+            "mau_trial_days", 0,
+        )
+
         # Options to disable HS
         self.hs_disabled = config.get("hs_disabled", False)
         self.hs_disabled_message = config.get("hs_disabled_message", "")
@@ -365,6 +370,7 @@ class ServerConfig(Config):
           # Enables monthly active user checking
           # limit_usage_by_mau: False
           # max_mau_value: 50
+          # mau_trial_days: 2
           #
           # Sometimes the server admin will want to ensure certain accounts are
           # never blocked by mau checking. These accounts are specified here.