M-Labs/it-infra
M-Labs
/
it-infra
8
0
Fork 5
Code Issues 10 Pull Requests 2 Releases Wiki Activity

WIP: Use postfix options for routing mails through tunnel #45

Draft
esavkin wants to merge 9 commits from enable-mail-proxy-and-tunnel into master
pull from: enable-mail-proxy-and-tunnel
merge into: M-Labs:master
Conversation 1 Commits 9 Files Changed 2 +11 -2
1 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit c3be96a166 - Show all commits

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

@ -1186,14 +1186,18 @@ in
Restart = "on-failure";
User = "hydra-queue-runner"; # TODO needs new user both here and there
Group = "hydra";
ExecStart = "${pkgs.openssh}/bin/ssh -N -L 127.0.0.1:1587:5.78.86.156:1587 zolaupd@5.78.86.156";
ExecStart = "${pkgs.openssh}/bin/ssh -N -D 127.0.0.1:1587 zolaupd@5.78.86.156";
};
};
environment.etc."postfix/sender_relay".text = ''
@m-labs-intl.com [localhost]:1587
m-labs-intl.com socks:
* :
'';
esavkin marked this conversation as resolved Outdated
sb10q commented 2024-08-22 13:13:27 +08:00
Outdated
Review
Copy Link

Does postfix require all domains to be listed there, even those without a relay host?

Does postfix require all domains to be listed there, even those without a relay host?
esavkin commented 2024-08-22 13:23:14 +08:00
Outdated
Review
Copy Link

As in examples at https://www.postfix.org/transport.5.html , a wildcard is probably a better way

As in examples at https://www.postfix.org/transport.5.html , a wildcard is probably a better way
environment.etc."tsocks.conf".text = ''
server = 127.0.0.1
server_port = 1587
'';
systemd.services.postfix-rebuild-sender-relay = {
description = "Postfix Rebuild Sender Dependent Relayhost Maps";
serviceConfig = {
@ -1216,6 +1220,11 @@ in
sender_dependent_relayhost_maps = "hash:/etc/postfix/sender_relay";
postscreen_upstream_proxy_protocol = "haproxy";
postscreen_upstream_proxy_timeout = "5s";
masterConfig.socks = {
type = "unix";
command = "pipe";
args = "flags=R user=nobody argv=${pkgs.tsocks}/bin/tsocks ${pkgs.postfix}/bin/sendmail -oi -f $sender $recipient";
};
};
};
services.roundcube = {