[mailman3] Update default variables

Signed-off-by: Michal Konecny <mkonecny@redhat.com>

playbooks/groups/mailman.yml

@@ -100,8 +100,10 @@
     mailman_hyperkitty_admin_db_pass: "{{ mailman_hk_admin_db_pass }}"
     mailman_hyperkitty_db_pass: "{{ mailman_hk_db_pass }}"
     mailman_hyperkitty_cookie_key: "{{ mailman_hk_cookie_key }}"
+    mailman_smtp_port: 587
     when: env != "staging"
   - role: mailman3
+    mailman_log_level: debug
     mailman_rest_api_user: "{{ mailman_stg_rest_api_user }}"
     mailman_rest_api_pass: "{{ mailman_stg_rest_api_pass }}"
     mailman_mailman_db_pass: "{{ mailman_mm_db_pass }}"

roles/mailman3/defaults/main.yml

@@ -6,7 +6,7 @@ mailman_rest_api_user: restadmin
 mailman_rest_api_pass: changeme
 mailman_rest_api_workers: 2
 mailman_log_directory: /var/log/mailman3
-mailman_log_level: debug
+mailman_log_level: info
 mailman_log_items:
   - archiver
   - bounce
@@ -17,12 +17,14 @@ mailman_log_items:
   - smtp
   - subscribe
   - task
+mailman_smtp_port: 25
 
 # Mailman DB settings (the values should be provided by playbook)
 mailman_db_server: localhost
 mailman_mailman_db_pass: changeme
 
 # Hyperkitty/Postorius settings (the values should be provided by playbook)
+mailman_hyperkitty_debug: false
 mailman_hyperkitty_admin_db_pass: changeme
 mailman_hyperkitty_db_pass: changeme
 mailman_hyperkitty_cookie_key: changeme

roles/mailman3/templates/mailman.cfg.j2

@@ -85,7 +85,7 @@ jump_chain: discard
 
 [mta]
 # Email is sent on the submission port to bypass spam checking.
-smtp_port: 587
+smtp_port: { mailman_smtp_port }
 # Remove DKIM signatures in the email headers.
 remove_dkim_headers: yes
 # Don't process old stale bounces

roles/mailman3/templates/settings.py.j2

@@ -13,11 +13,7 @@ from mailman_web.settings.mailman import *  # noqa: F403
 SECRET_KEY = '{{ mailman_hyperkitty_cookie_key }}'
 
 # SECURITY WARNING: don't run with debug turned on in production!
-{% if env == 'staging' %}
-DEBUG = True
-{% else %}
-DEBUG = False
-{% endif %}
+DEBUG = { mailman_hyperkitty_debug }
 
 ADMINS = (
      ('HyperKitty Admin', 'abompard@fedoraproject.org'),