postfix config renames
This commit is contained in:
parent
8632bab88f
commit
0c0c944110
1 changed files with 31 additions and 29 deletions
|
|
@ -26,8 +26,6 @@ in {
|
||||||
|
|
||||||
services.postfix = {
|
services.postfix = {
|
||||||
enable = true;
|
enable = true;
|
||||||
domain = config.networking.domain;
|
|
||||||
hostname = config.networking.fqdn;
|
|
||||||
virtual = ''
|
virtual = ''
|
||||||
@ktiu.net till.straube@t9e.me
|
@ktiu.net till.straube@t9e.me
|
||||||
@t9e.me till.straube@t9e.me
|
@t9e.me till.straube@t9e.me
|
||||||
|
|
@ -38,25 +36,6 @@ in {
|
||||||
@t9e.me anything
|
@t9e.me anything
|
||||||
'';
|
'';
|
||||||
|
|
||||||
config = {
|
|
||||||
virtual_mailbox_domains = [ "t9e.me" "ktiu.net" ];
|
|
||||||
virtual_mailbox_maps = "hash:/etc/postfix/virtual-mailboxes";
|
|
||||||
virtual_transport = "lmtp:unix:/var/run/dovecot2/lmtp";
|
|
||||||
smtpd_tls_security_level = "may";
|
|
||||||
};
|
|
||||||
|
|
||||||
networks = [
|
|
||||||
"127.0.0.0/8"
|
|
||||||
"[::ffff:127.0.0.0]/104"
|
|
||||||
"[::1]/128"
|
|
||||||
];
|
|
||||||
|
|
||||||
settings.main.smtpd_tls_chain_files = [
|
|
||||||
"${config.security.acme.certs."${config.networking.fqdn}-postfix".directory + "/key.pem"}"
|
|
||||||
"${config.security.acme.certs."${config.networking.fqdn}-postfix".directory + "/cert.pem"}"
|
|
||||||
];
|
|
||||||
# sslKey = config.security.acme.certs."${config.networking.fqdn}-postfix".directory + "/key.pem";
|
|
||||||
# sslCert = config.security.acme.certs."${config.networking.fqdn}-postfix".directory + "/cert.pem";
|
|
||||||
|
|
||||||
enableSubmission = true;
|
enableSubmission = true;
|
||||||
submissionOptions = {
|
submissionOptions = {
|
||||||
|
|
@ -71,7 +50,23 @@ 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";
|
||||||
};
|
};
|
||||||
|
|
||||||
masterConfig = {
|
settings = {
|
||||||
|
|
||||||
|
main = {
|
||||||
|
virtual_mailbox_domains = [ "t9e.me" "ktiu.net" ];
|
||||||
|
virtual_mailbox_maps = "hash:/etc/postfix/virtual-mailboxes";
|
||||||
|
virtual_transport = "lmtp:unix:/var/run/dovecot2/lmtp";
|
||||||
|
smtpd_tls_security_level = "may";
|
||||||
|
mydomain = config.networking.domain;
|
||||||
|
myhostname = config.networking.fqdn;
|
||||||
|
mynetworks = [
|
||||||
|
"127.0.0.0/8"
|
||||||
|
"[::ffff:127.0.0.0]/104"
|
||||||
|
"[::1]/128"
|
||||||
|
];
|
||||||
|
};
|
||||||
|
|
||||||
|
master = {
|
||||||
"submission-header-cleanup" = {
|
"submission-header-cleanup" = {
|
||||||
type = "unix";
|
type = "unix";
|
||||||
private = false;
|
private = false;
|
||||||
|
|
@ -81,5 +76,12 @@ in {
|
||||||
args = ["-o" "header_checks=pcre:${submissionHeaderCleanupRules}"];
|
args = ["-o" "header_checks=pcre:${submissionHeaderCleanupRules}"];
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
|
smtpd_tls_chain_files = [
|
||||||
|
"${config.security.acme.certs."${config.networking.fqdn}-postfix".directory + "/key.pem"}"
|
||||||
|
"${config.security.acme.certs."${config.networking.fqdn}-postfix".directory + "/cert.pem"}"
|
||||||
|
];
|
||||||
|
|
||||||
|
};
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue