summary refs log tree commit diff
path: root/synapse/config/server.py
diff options
context:
space:
mode:
authorDaniel Wagner-Hall <dawagner@gmail.com>2015-10-05 20:52:15 -0500
committerDaniel Wagner-Hall <dawagner@gmail.com>2015-10-05 20:52:15 -0500
commitddd079c8f8127b5ef9f12b1c1d9387bd9f34d74b (patch)
treee88b15f55f6b46c19c8f3c4506489723d08b0977 /synapse/config/server.py
parentRevert "Merge pull request #283 from matrix-org/erikj/atomic_join_federation" (diff)
parentPreserve version string in user agent (diff)
downloadsynapse-ddd079c8f8127b5ef9f12b1c1d9387bd9f34d74b.tar.xz
Merge branch 'daniel/useragent' into daniel/3pidinvites
Diffstat (limited to 'synapse/config/server.py')
-rw-r--r--synapse/config/server.py1
1 files changed, 1 insertions, 0 deletions
diff --git a/synapse/config/server.py b/synapse/config/server.py
index 4d12d49857..5c2d6bfeab 100644
--- a/synapse/config/server.py
+++ b/synapse/config/server.py
@@ -26,6 +26,7 @@ class ServerConfig(Config):
         self.soft_file_limit = config["soft_file_limit"]
         self.daemonize = config.get("daemonize")
         self.print_pidfile = config.get("print_pidfile")
+        self.user_agent_suffix = config.get("user_agent_suffix")
         self.use_frozen_dicts = config.get("use_frozen_dicts", True)
 
         self.listeners = config.get("listeners", [])