postfix: use masterConfig option instead of extraMasterConf

extraMasterConf is just a string while masterConfig is a nix module so
the options are more explicit and has help text.
This commit is contained in:
Brian Olsen 2018-05-12 18:00:14 +02:00 committed by Ruben Maher
parent 7036371f75
commit f209fa3bf3

View File

@ -183,11 +183,16 @@ in
smtpd_recipient_restrictions = "reject_non_fqdn_recipient,reject_unknown_recipient_domain,permit_sasl_authenticated,reject"; smtpd_recipient_restrictions = "reject_non_fqdn_recipient,reject_unknown_recipient_domain,permit_sasl_authenticated,reject";
cleanup_service_name = "submission-header-cleanup"; cleanup_service_name = "submission-header-cleanup";
}; };
masterConfig = {
extraMasterConf = '' "submission-header-cleanup" = {
submission-header-cleanup unix n - n - 0 cleanup type = "unix";
-o header_checks=pcre:${submissionHeaderCleanupRules} private = false;
''; chroot = false;
maxproc = 0;
command = "cleanup";
args = ["-o" "header_checks=pcre:${submissionHeaderCleanupRules}"];
};
};
}; };
}; };
} }