From d40b60f56438c78db11cca0c4b802c39a8f31ae5 Mon Sep 17 00:00:00 2001
From: putro <putro@autistici.org>
Date: Mon, 11 Nov 2019 23:06:42 +0100
Subject: [PATCH] added postfix_message_size_limit
---
roles/mail/defaults/main.yml | 2 ++
roles/mail/templates/main.cf.base.j2 | 2 ++
roles/mail/templates/postfix-out/main.cf | 3 ---
3 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/roles/mail/defaults/main.yml b/roles/mail/defaults/main.yml
index fb6cc48d..572c775f 100644
--- a/roles/mail/defaults/main.yml
+++ b/roles/mail/defaults/main.yml
@@ -34,3 +34,5 @@ static_mail_domains: []
# Final destination address for abuse@ postmaster@ and similar.
abuse_destination_addr: "root@{{ domain }}"
+
+postfix_message_size_limit: 20971520
diff --git a/roles/mail/templates/main.cf.base.j2 b/roles/mail/templates/main.cf.base.j2
index 61c0f651..1cbd8495 100644
--- a/roles/mail/templates/main.cf.base.j2
+++ b/roles/mail/templates/main.cf.base.j2
@@ -43,3 +43,5 @@ default_database_type = cdb
indexed = ${default_database_type}:${config_directory}/
#pcre = pcre:${config_directory}/
#ldap = proxy:ldap:/etc/postfix/ldap/
+
+message_size_limit = {{ postfix_message_size_limit }}
diff --git a/roles/mail/templates/postfix-out/main.cf b/roles/mail/templates/postfix-out/main.cf
index ce840390..71672235 100644
--- a/roles/mail/templates/postfix-out/main.cf
+++ b/roles/mail/templates/postfix-out/main.cf
@@ -48,9 +48,6 @@ transport_maps = ${ldap}all-recipients ${indexed}transport ${indexed}mailman_tra
# resolve aliases
virtual_alias_maps = ${indexed}virtual ${ldap}aliases
-# Message size limit.
-message_size_limit = 20971520
-
# Concurrency tuning for "relay" and "smtp" transport.
relay_destination_concurrency_limit = 20
default_destination_concurrency_limit = 20
--
GitLab