esavkin
/
it-infra
forked from M-Labs/it-infra
1
0
Fork 0
Code Pull Requests Activity

Compare commits

base: esavkin:d27ee750a2590ec2c3251ee5a3bb6f9033fa9a55
Branches Tags
esavkin:master
esavkin:34-network-cycle-dependency-fix
esavkin:intl-upload-fix
M-Labs:master
...
compare: esavkin:eabd92d2e8aebcfa4220048b9f1fba36c929016b
Branches Tags
esavkin:34-network-cycle-dependency-fix
esavkin:intl-upload-fix
esavkin:master
M-Labs:master

2 Commits
d27ee750a2 ... eabd92d2e8

Author SHA1 Message Date
Egor Savkin eabd92d2e8 Use tunnel for uploading web-intl 
Signed-off-by: Egor Savkin <es@m-labs.hk>
 2024-10-24 17:35:34 +08:00
Sébastien Bourdeauducq 04a64c3710 nixbld: set up RT for m-labs-intl.com 2024-10-24 15:49:41 +08:00
2 changed files with 14 additions and 3 deletions
Show Stats Expand all files Collapse all files

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

@ -755,7 +755,7 @@ in
</runcommand>
<runcommand>
job = web:web:web-intl
command = [ $(jq '.buildStatus' < $HYDRA_JSON) = 0 ] && ${pkgs.rsync}/bin/rsync -r -c $(jq -r '.outputs[0].path' < $HYDRA_JSON)/ zolaupd@5.78.86.156:/var/www/m-labs-intl.com/html/
command = [ $(jq '.buildStatus' < $HYDRA_JSON) = 0 ] && ${pkgs.rsync}/bin/rsync -r -c $(jq -r '.outputs[0].path' < $HYDRA_JSON)/ zolaupd@10.47.3.0:/var/www/m-labs-intl.com/html/
</runcommand>
<runcommand>
job = web:web:nmigen-docs
@ -1249,7 +1249,18 @@ in
Restart = "on-failure";
User = "rt";
Group = "rt";
ExecStart = "${pkgs.bash}/bin/bash -c 'PATH=${pkgs.rt}/bin HOME=/tmp ${pkgs.fetchmail}/bin/fetchmail -f /etc/nixos/secret/rt_fetchmailrc'";
ExecStart = "${pkgs.bash}/bin/bash -c 'PATH=${pkgs.rt}/bin HOME=/tmp ${pkgs.fetchmail}/bin/fetchmail --pidfile /tmp/.fetchmail.pid -f /etc/nixos/secret/rt_fetchmailrc'";
};
};
systemd.services.rt-fetchmail-intl = {
description = "Fetchmail for RT (intl)";
wantedBy = [ "multi-user.target" ];
after = [ "dovecot2.service" ];
serviceConfig = {
Restart = "on-failure";
User = "rt";
Group = "rt";
ExecStart = "${pkgs.bash}/bin/bash -c 'PATH=${pkgs.rt}/bin HOME=/tmp ${pkgs.fetchmail}/bin/fetchmail --pidfile /tmp/.fetchmail-intl.pid -f /etc/nixos/secret/rt_fetchmailrc_intl'";
};
};

2
nixbld-etc-nixos/rt.nix
View File

@ -30,7 +30,7 @@ let
Set($OwnerEmail, '${cfg.ownerEmail}');
Set($MaxAttachmentSize, 15360000);
Set($CheckMoreMSMailHeaders, 1);
Set($RTAddressRegexp, '^(helpdesk|sales)\@(m-labs.hk)$');
Set($RTAddressRegexp, '^(helpdesk)\@(m-labs.hk|m-labs-intl.com)$');
Set($LoopsToRTOwner, 0);
# System (Outgoing mail)