M-Labs/it-infra
M-Labs
/
it-infra
8
0
Fork 6
Code Issues 11 Pull Requests 1 Releases Wiki Activity

Fix postfix settings so it should load successfully and accept and send messages through tunnel 

Signed-off-by: Egor Savkin <es@m-labs.hk>
This commit is contained in:
Egor Savkin 2024-10-08 16:00:18 +08:00
parent 95ee041e13
commit 02b0095e81
1 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
nixbld-etc-nixos/configuration.nix
View File

@ -1260,14 +1260,14 @@ in
}; };
}; };
services.postfix.mapFiles.sender_relay = pkgs.writeText "sender_relay" '' services.postfix.mapFiles.sender_transport = pkgs.writeText "sender_transport" ''
m-labs-intl.com smtptun: @m-labs-intl.com smtptun:
* : * :
''; '';
systemd.services.postfix-rebuild-sender-relay = { systemd.services.postfix-rebuild-sender-relay = {
description = "Postfix Rebuild Sender Dependent Relayhost Maps"; description = "Postfix Rebuild Sender Dependent Transport Maps";
serviceConfig = { serviceConfig = {
ExecStart = "${pkgs.postfix}/sbin/postmap /var/lib/postfix/conf/sender_relay"; ExecStart = "${pkgs.postfix}/sbin/postmap /var/lib/postfix/conf/sender_transport";
}; };
wantedBy = [ "multi-user.target" ]; wantedBy = [ "multi-user.target" ];
}; };
@ -1283,12 +1283,16 @@ in
} // (import /etc/nixos/secret/email_settings.nix); } // (import /etc/nixos/secret/email_settings.nix);
services.postfix = { services.postfix = {
config = { config = {
sender_dependent_relayhost_maps = "hash:/var/lib/postfix/conf/sender_relay"; sender_dependent_default_transport_maps = "hash:/var/lib/postfix/conf/sender_transport";
}; };
masterConfig."smtptun" = { masterConfig."smtptun" = {
type = "unix"; type = "unix";
command = "smtp"; command = "smtp";
args = [ "-o" "smtp_bind_address=10.47.3.2" ]; args = [
"-o" "smtp_bind_address=10.47.3.2"
"-o" "inet_interfaces=10.47.3.2"
"-o" "inet_protocols=ipv4"
];
}; };
}; };