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

Use tsocks to wrap socks and add sock transport type 

Signed-off-by: Egor Savkin <es@m-labs.hk>
This commit is contained in:
Egor Savkin 2024-08-23 17:18:56 +08:00
parent 2ea87d3d1b
commit 355c69f1b0
1 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1214,14 +1214,18 @@ in
Restart = "on-failure"; Restart = "on-failure";
User = "hydra-queue-runner"; # TODO needs new user both here and there User = "hydra-queue-runner"; # TODO needs new user both here and there
Group = "hydra"; 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 = '' environment.etc."postfix/sender_relay".text = ''
@m-labs-intl.com [localhost]:1587 m-labs-intl.com socks:
* : * :
''; '';
environment.etc."tsocks.conf".text = ''
server = 127.0.0.1
server_port = 1587
'';
systemd.services.postfix-rebuild-sender-relay = { systemd.services.postfix-rebuild-sender-relay = {
description = "Postfix Rebuild Sender Dependent Relayhost Maps"; description = "Postfix Rebuild Sender Dependent Relayhost Maps";
serviceConfig = { serviceConfig = {
@ -1244,6 +1248,11 @@ in
sender_dependent_relayhost_maps = "hash:/etc/postfix/sender_relay"; sender_dependent_relayhost_maps = "hash:/etc/postfix/sender_relay";
postscreen_upstream_proxy_protocol = "haproxy"; postscreen_upstream_proxy_protocol = "haproxy";
postscreen_upstream_proxy_timeout = "5s"; 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 = { services.roundcube = {