summary refs log tree commit diff
path: root/synapse/config/account_validity.py
diff options
context:
space:
mode:
authorBrendan Abolivier <babolivier@matrix.org>2021-09-06 16:23:50 +0200
committerGitHub <noreply@github.com>2021-09-06 16:23:50 +0200
commit8c9e723fe0414c7d93aa93180cdedc163b2058c5 (patch)
treed669c8d764d988207b44db1de0b1648350582889 /synapse/config/account_validity.py
parentSupport MSC3375: room version 9. (#10747) (diff)
downloadsynapse-8c9e723fe0414c7d93aa93180cdedc163b2058c5.tar.xz
Add a warning when using deprecated template_dir settings (#10768)
The deprecation itself happened in #10596 which shipped with Synapse v1.41.0. However, it doesn't seem fair to suddenly drop support for these settings in ~4-6w without being more vocal about said deprecation.
Diffstat (limited to 'synapse/config/account_validity.py')
-rw-r--r--synapse/config/account_validity.py14
1 files changed, 14 insertions, 0 deletions
diff --git a/synapse/config/account_validity.py b/synapse/config/account_validity.py
index 52e63ab1f6..ffaffc4931 100644
--- a/synapse/config/account_validity.py
+++ b/synapse/config/account_validity.py
@@ -11,8 +11,20 @@
 # 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.
+import logging
+
 from synapse.config._base import Config, ConfigError
 
+logger = logging.getLogger(__name__)
+
+LEGACY_TEMPLATE_DIR_WARNING = """
+This server's configuration file is using the deprecated 'template_dir' setting in the
+'account_validity' section. Support for this setting has been deprecated and will be
+removed in a future version of Synapse. Server admins should instead use the new
+'custom_templates_directory' setting documented here:
+https://matrix-org.github.io/synapse/latest/templates.html
+---------------------------------------------------------------------------------------"""
+
 
 class AccountValidityConfig(Config):
     section = "account_validity"
@@ -69,6 +81,8 @@ class AccountValidityConfig(Config):
 
         # Load account validity templates.
         account_validity_template_dir = account_validity_config.get("template_dir")
+        if account_validity_template_dir is not None:
+            logger.warning(LEGACY_TEMPLATE_DIR_WARNING)
 
         account_renewed_template_filename = account_validity_config.get(
             "account_renewed_html_path", "account_renewed.html"