only redirect to https if we have letsencrypt

[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 94642721363260896b90053b27827cabd252a929..89dd0d87bbf784bccde4edbc9343ccd75a3ce8ac 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.
 #


@@ -131,3 +132,12 @@ DEFAULT_DMARC_MODERATION_ACTION = 1 # Munge From
 
 # Spammer protection
 SUBSCRIBE_FORM_SECRET = "{{postfix.mailman.form_secret}}"
 
 # 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 %}
+]