diff options
| author | Neil Johnson <neil@matrix.org> | 2019-01-30 10:28:08 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-01-30 10:28:08 +0000 |
| commit | ee4df7fd7a8d4ce7732ded1736f52d200d645f25 (patch) | |
| tree | 79dfebdef9ce6951a7f6e3b2b657a768ddf86ffc /synapse/config/consent_config.py | |
| parent | define room dispositions for use in exposing room capabilities (diff) | |
| parent | Merge pull request #4486 from xperimental/workaround-4216 (diff) | |
| download | synapse-ee4df7fd7a8d4ce7732ded1736f52d200d645f25.tar.xz | |
Merge branch 'develop' into neilj/room_capabilities
Diffstat (limited to 'synapse/config/consent_config.py')
| -rw-r--r-- | synapse/config/consent_config.py | 14 |
1 files changed, 13 insertions, 1 deletions
diff --git a/synapse/config/consent_config.py b/synapse/config/consent_config.py index f193a090ae..9f2e85342f 100644 --- a/synapse/config/consent_config.py +++ b/synapse/config/consent_config.py @@ -13,6 +13,10 @@ # See the License for the specific language governing permissions and # limitations under the License. +from os import path + +from synapse.config import ConfigError + from ._base import Config DEFAULT_CONFIG = """\ @@ -85,7 +89,15 @@ class ConsentConfig(Config): if consent_config is None: return self.user_consent_version = str(consent_config["version"]) - self.user_consent_template_dir = consent_config["template_dir"] + self.user_consent_template_dir = self.abspath( + consent_config["template_dir"] + ) + if not path.isdir(self.user_consent_template_dir): + raise ConfigError( + "Could not find template directory '%s'" % ( + self.user_consent_template_dir, + ), + ) self.user_consent_server_notice_content = consent_config.get( "server_notice_content", ) |