This repository has no description
0

Configure Feed

Select the types of activity you want to include in your feed.

mutt: fix DKIM signing via SSH fallback

- SSH fallback now uses msmtp to submit via localhost:25
- This goes through exim daemon which has DKIM credentials
- Add msmtp to exim-smarthost for local submission
- Expose msmtp wrapper via passthru

+11 -4
+3
2configs/exim-smarthost.nix
··· 343 343 } 344 344 ]; 345 345 }; 346 + # msmtp for local submission via SSH (connects to localhost:25) 347 + environment.systemPackages = [ pkgs.msmtp ]; 348 + 346 349 krebs.iptables.tables.filter.INPUT.rules = [ 347 350 { 348 351 predicate = "-p tcp --dport smtp";
+8 -4
tools/mutt/flake-module.nix
··· 54 54 ${pkgs.coreutils}/bin/tee >(${pkgs.notmuch}/bin/notmuch insert +sent) | \ 55 55 ${pkgs.msmtp}/bin/msmtp -C ${msmtprc} "$@" 56 56 else 57 - # Fall back to SSH tunnel to neoprism 57 + # Fall back to SSH tunnel to neoprism, submit via SMTP to local daemon 58 58 echo "neoprism.r not reachable, sending via SSH..." >&2 59 59 ${pkgs.coreutils}/bin/tee >(${pkgs.notmuch}/bin/notmuch insert +sent) | \ 60 - ${pkgs.openssh}/bin/ssh -p 45621 neoprism.lassul.us sendmail -t 60 + ${pkgs.openssh}/bin/ssh -p 45621 neoprism.lassul.us 'msmtp -C /dev/null --host=localhost --port=25 --read-envelope-from --read-recipients' 61 61 fi 62 62 ''; 63 63 ··· 200 200 ''; 201 201 202 202 in 203 - self.wrapLib.makeWrapper { 203 + (self.wrapLib.makeWrapper { 204 204 pkgs = pkgs; 205 205 package = pkgs.neomutt; 206 206 aliases = [ "mutt" ]; ··· 220 220 flags = { 221 221 "-F" = "${muttrc}"; 222 222 }; 223 - }; 223 + }).overrideAttrs (old: { 224 + passthru = (old.passthru or { }) // { 225 + inherit msmtp; 226 + }; 227 + }); 224 228 }; 225 229 }