Merge branch 'postfix-warnings' into 'master'
postfix: resolve main/master option deprecation See merge request simple-nixos-mailserver/nixos-mailserver!464
This commit is contained in:
@@ -289,7 +289,7 @@ in
|
|||||||
forwards
|
forwards
|
||||||
]);
|
]);
|
||||||
|
|
||||||
config = {
|
settings.main = {
|
||||||
myhostname = cfg.sendingFqdn;
|
myhostname = cfg.sendingFqdn;
|
||||||
mydestination = ""; # disable local mail delivery
|
mydestination = ""; # disable local mail delivery
|
||||||
recipient_delimiter = cfg.recipientDelimiter;
|
recipient_delimiter = cfg.recipientDelimiter;
|
||||||
@@ -429,7 +429,7 @@ in
|
|||||||
submissionOptions = submissionOptions;
|
submissionOptions = submissionOptions;
|
||||||
submissionsOptions = submissionOptions;
|
submissionsOptions = submissionOptions;
|
||||||
|
|
||||||
masterConfig = {
|
settings.master = {
|
||||||
"lmtp" = {
|
"lmtp" = {
|
||||||
# Add headers when delivering, see http://www.postfix.org/smtp.8.html
|
# Add headers when delivering, see http://www.postfix.org/smtp.8.html
|
||||||
# D => Delivered-To, O => X-Original-To, R => Return-Path
|
# D => Delivered-To, O => X-Original-To, R => Return-Path
|
||||||
|
|||||||
Reference in New Issue
Block a user