journalwatch: allow more TLS errors

[ansible.git] / roles / email / templates / mm_cfg.py

diff --git a/roles/email/templates/mm_cfg.py b/roles/email/templates/mm_cfg.py
index a3b02f948504816cd27dbc590987fb5f9d80ff17..2b9c4518345ee480035caeeeeebfa6b0e2018852 100644 (file)
--- a/roles/email/templates/mm_cfg.py
+++ b/roles/email/templates/mm_cfg.py
@@ -1,4 +1,5 @@
 # -*- python -*-
 # -*- python -*-

+# -*- coding: utf-8 -*-

 
 # Copyright (C) 1998,1999,2000 by the Free Software Foundation, Inc.
 #
 
 # Copyright (C) 1998,1999,2000 by the Free Software Foundation, Inc.
 #


@@ -120,6 +121,7 @@ DEB_LISTMASTER = '{{postfix.postmaster}}'
 DEFAULT_ARCHIVE = Off
 DEFAULT_MAX_MESSAGE_SIZE = 1024           # KB
 DEFAULT_ADMIN_MEMBER_CHUNKSIZE = 100
 DEFAULT_ARCHIVE = Off
 DEFAULT_MAX_MESSAGE_SIZE = 1024           # KB
 DEFAULT_ADMIN_MEMBER_CHUNKSIZE = 100

+DEFAULT_BOUNCE_UNRECOGNIZED_GOES_TO_LIST_OWNER = No

 
 # footer
 DEFAULT_MSG_FOOTER = """{{postfix.mailman.default_footer}}"""
 
 # footer
 DEFAULT_MSG_FOOTER = """{{postfix.mailman.default_footer}}"""


@@ -128,3 +130,15 @@ DEFAULT_DIGEST_FOOTER = DEFAULT_MSG_FOOTER
 # DMARC, DKIM-compatibility
 REMOVE_DKIM_HEADERS = 1 # remove DKIM headers for lists where From: is changed
 DEFAULT_DMARC_MODERATION_ACTION = 1 # Munge From
 # DMARC, DKIM-compatibility
 REMOVE_DKIM_HEADERS = 1 # remove DKIM headers for lists where From: is changed
 DEFAULT_DMARC_MODERATION_ACTION = 1 # Munge From

+
+# Spammer protection
+SUBSCRIBE_FORM_SECRET = "{{postfix.mailman.form_secret}}"
+CAPTCHAS = [
+{% for item in postfix.mailman.captcha %}
+    ('{{item.question}}', [
+    {% for answer in item.answers %}
+        '{{answer}}',
+    {% endfor %}
+    ]),
+{% endfor %}
+]