This repository has no description
0

Configure Feed

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

neoprism: migrate mail from prism

- DNS: mail.lassul.us now points to neoprism
- neoprism: use exim-smarthost.nix with internet-aliases
- mutt: send via neoprism.r instead of prism.r
- riot.nix: remove duplicate exim-smarthost import
- remove krebspage (git repo was lost)

+13 -21
-3
2configs/riot.nix
··· 12 12 ]; 13 13 in 14 14 { 15 - imports = [ 16 - self.inputs.stockholm.nixosModules.exim-smarthost 17 - ]; 18 15 containers.riot = { 19 16 config = { 20 17 environment.systemPackages = [
+4 -4
2configs/dns/lassul.us.zone
··· 55 55 56 56 ;; Mail 57 57 @ IN MX 3 mail 58 - mail IN A 95.216.1.150 59 - mail IN AAAA 2a01:4f9:2a:1e9::1 60 - imap IN A 95.216.1.150 61 - imap IN AAAA 2a01:4f9:2a:1e9::1 58 + mail IN A 95.217.192.59 59 + mail IN AAAA 2a01:4f9:4a:4f1a::2 60 + imap IN A 95.217.192.59 61 + imap IN AAAA 2a01:4f9:4a:4f1a::2 62 62 smtp._tls IN TXT "v=TLSRPTv1;rua=mailto:postmaster@lassul.us" 63 63 ; 64 64 default._domainkey IN TXT "k=rsa; p=MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQDUv3DMndFellqu208feABEzT/PskOfTSdJCOF/HELBR0PHnbBeRoeHEm9XAcOe/Mz2t/ysgZ6JFXeFxCtoM5fG20brUMRzsVRxb9Ur5cEvOYuuRrbChYcKa+fopu8pYrlrqXD3miHISoy6ErukIYCRpXWUJHi1TlNQhLWFYqAaywIDAQAB"
+4 -1
2configs/mail/internet-gateway.nix
··· 1 1 { config, pkgs, ... }: 2 2 { 3 + networking.firewall.allowedTCPPorts = [ 25 ]; 4 + 3 5 security.acme.certs."mail.lassul.us" = { 4 6 group = "lasscert"; 5 7 webroot = "/var/lib/acme/acme-challenge"; ··· 34 36 ]; 35 37 ssl_cert = "/var/lib/acme/mail.lassul.us/fullchain.pem"; 36 38 ssl_key = "/var/lib/acme/mail.lassul.us/key.pem"; 39 + sender_domains = [ "lassul.us" ]; 37 40 local_domains = [ 38 41 "localhost" 39 42 "lassul.us" ··· 43 46 driver = manualroute 44 47 domains = lassul.us 45 48 transport = remote_smtp 46 - route_list = * orange.r 49 + route_list = * green.r 47 50 no_more 48 51 ''; 49 52 };
-4
2configs/websites/lassulus.nix
··· 37 37 locations."= /wireguard-key".extraConfig = '' 38 38 alias ${pkgs.writeText "prism.wg" config.krebs.hosts.prism.nets.wiregrill.wireguard.pubkey}; 39 39 ''; 40 - locations."= /krebspage".extraConfig = '' 41 - default_type "text/html"; 42 - alias ${pkgs.krebspage}/index.html; 43 - ''; 44 40 locations."= /ssh.pub".extraConfig = '' 45 41 alias ${pkgs.writeText "pub" config.krebs.users.lass.pubkey}; 46 42 '';
+1 -1
machines/neoprism/config.nix
··· 5 5 ../../2configs 6 6 ../../2configs/ssh-redirect.nix 7 7 ../../2configs/retiolum.nix 8 - ../../2configs/mail/internet-gateway.nix 8 + ../../2configs/exim-smarthost.nix 9 9 ../../2configs/gsm-wiki.nix 10 10 ../../2configs/monitoring/telegraf.nix 11 11 ../../2configs/pair-programming.nix
+4 -4
tools/mutt/flake-module.nix
··· 22 22 defaults 23 23 logfile ~/.msmtp.log 24 24 account prism 25 - host prism.r 25 + host neoprism.r 26 26 account c-base 27 27 from lassulus@c-base.org 28 28 host c-mail.c-base.org ··· 49 49 if [ "$using_cbase" -eq 1 ]; then 50 50 ${pkgs.coreutils}/bin/tee >(${pkgs.notmuch}/bin/notmuch insert +sent) | \ 51 51 ${pkgs.msmtp}/bin/msmtp -C ${msmtprc} "$@" 52 - # For prism account, check if prism.r is reachable 53 - elif ping -W2 -c1 prism.r >/dev/null 2>&1; then 52 + # For prism account, check if neoprism.r is reachable 53 + elif ping -W2 -c1 neoprism.r >/dev/null 2>&1; then 54 54 ${pkgs.coreutils}/bin/tee >(${pkgs.notmuch}/bin/notmuch insert +sent) | \ 55 55 ${pkgs.msmtp}/bin/msmtp -C ${msmtprc} "$@" 56 56 else 57 - echo "Error: prism.r is not reachable" >&2 57 + echo "Error: neoprism.r is not reachable" >&2 58 58 exit 1 59 59 fi 60 60 '';
-4
2configs/services/site/default.nix
··· 30 30 locations."= /wireguard-key".extraConfig = '' 31 31 alias ${pkgs.writeText "prism.wg" config.krebs.hosts.prism.nets.wiregrill.wireguard.pubkey}; 32 32 ''; 33 - locations."= /krebspage".extraConfig = '' 34 - default_type "text/html"; 35 - alias ${pkgs.krebspage}/index.html; 36 - ''; 37 33 locations."= /ssh.pub".extraConfig = '' 38 34 alias ${pkgs.writeText "pub" config.krebs.users.lass-yubikey.pubkey}; 39 35 '';