diff options
| author | Paul "LeoNerd" Evans <paul@matrix.org> | 2015-12-10 16:21:00 +0000 |
|---|---|---|
| committer | Paul "LeoNerd" Evans <paul@matrix.org> | 2015-12-10 16:21:00 +0000 |
| commit | d7ee7b589f0535c21301f38e93b0cabc0cf288d4 (patch) | |
| tree | fcd7d110dc66d5e175f1030d10e0bbd5624bbf3c /synapse/config/cas.py | |
| parent | Don't complain if /make_join response lacks 'prev_state' list (SYN-517) (diff) | |
| parent | Merge pull request #432 from matrix-org/pushrules_refactor (diff) | |
| download | synapse-d7ee7b589f0535c21301f38e93b0cabc0cf288d4.tar.xz | |
Merge branch 'develop' into paul/tiny-fixes
Diffstat (limited to 'synapse/config/cas.py')
| -rw-r--r-- | synapse/config/cas.py | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/synapse/config/cas.py b/synapse/config/cas.py index a337ae6ca0..326e405841 100644 --- a/synapse/config/cas.py +++ b/synapse/config/cas.py @@ -27,10 +27,12 @@ class CasConfig(Config): if cas_config: self.cas_enabled = cas_config.get("enabled", True) self.cas_server_url = cas_config["server_url"] + self.cas_service_url = cas_config["service_url"] self.cas_required_attributes = cas_config.get("required_attributes", {}) else: self.cas_enabled = False self.cas_server_url = None + self.cas_service_url = None self.cas_required_attributes = {} def default_config(self, config_dir_path, server_name, **kwargs): @@ -39,6 +41,7 @@ class CasConfig(Config): #cas_config: # enabled: true # server_url: "https://cas-server.com" + # service_url: "https://homesever.domain.com:8448" # #required_attributes: # # name: value """ |