From bce144595ceb7cf5b02efd79ae67e23c0df9fa27 Mon Sep 17 00:00:00 2001 From: Caleb James DeLisle Date: Fri, 23 Jun 2017 15:26:09 +0200 Subject: Fix TravisCI tests for PR #2301 - Fat finger mistake --- push.py | 37 ------------------------------------- synapse/config/push.py | 37 +++++++++++++++++++++++++++++++++++++ 2 files changed, 37 insertions(+), 37 deletions(-) delete mode 100644 push.py create mode 100644 synapse/config/push.py diff --git a/push.py b/push.py deleted file mode 100644 index 4e5f428820..0000000000 --- a/push.py +++ /dev/null @@ -1,37 +0,0 @@ -# -*- coding: utf-8 -*- -# Copyright 2015, 2016 OpenMarket Ltd -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. - -from ._base import Config - - -class PushConfig(Config): - def read_config(self, config): - self.push_redact_content = False - - push_config = config.get("email", {}) - self.push_redact_content = push_config.get("redact_content", False) - - def default_config(self, config_dir_path, server_name, **kwargs): - return """ - # Control how push messages are sent to google/apple to notifications. - # Normally every message is posted to a push server hosted by matrix.org - # which is registered with google and apple in order to allow push - # notifications to be sent to mobile devices. - # Setting redact_content to true will make the push messages contain no - # message content which will provide increased privacy. - # - #push: - # redact_content: false - """ diff --git a/synapse/config/push.py b/synapse/config/push.py new file mode 100644 index 0000000000..4e5f428820 --- /dev/null +++ b/synapse/config/push.py @@ -0,0 +1,37 @@ +# -*- coding: utf-8 -*- +# Copyright 2015, 2016 OpenMarket Ltd +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + +from ._base import Config + + +class PushConfig(Config): + def read_config(self, config): + self.push_redact_content = False + + push_config = config.get("email", {}) + self.push_redact_content = push_config.get("redact_content", False) + + def default_config(self, config_dir_path, server_name, **kwargs): + return """ + # Control how push messages are sent to google/apple to notifications. + # Normally every message is posted to a push server hosted by matrix.org + # which is registered with google and apple in order to allow push + # notifications to be sent to mobile devices. + # Setting redact_content to true will make the push messages contain no + # message content which will provide increased privacy. + # + #push: + # redact_content: false + """ -- cgit 1.5.1