From 47bf9a94cd3fa549fb76a501fbf3c6d77035ab6f Mon Sep 17 00:00:00 2001 From: Jimbo Date: Thu, 24 Oct 2024 23:04:34 -0400 Subject: [PATCH] Add another domain, fix the mailserver from being able to recieve --- .../server/mailserver/simplenix/default.nix | 17 ++++++++++++++--- variables/secrets/default.nix | Bin 2466 -> 2497 bytes 2 files changed, 14 insertions(+), 3 deletions(-) diff --git a/modules/system/services/server/mailserver/simplenix/default.nix b/modules/system/services/server/mailserver/simplenix/default.nix index f192bb3..b36c04c 100644 --- a/modules/system/services/server/mailserver/simplenix/default.nix +++ b/modules/system/services/server/mailserver/simplenix/default.nix @@ -7,7 +7,12 @@ mailserver = rec { enable = true; - domains = [ "${config.secrets.jimDomain}" ]; + domains = [ + "${config.secrets.jimDomain}" + "${config.secrets.jimDomain2}" + "${config.secrets.lunaDomain}" + "${config.secrets.cornDomain}" + ]; fqdn = "mx.${config.secrets.jimDomain}"; certificateScheme = "acme-nginx"; localDnsResolver = false; @@ -26,9 +31,15 @@ hashedPasswordFile = pkgs.writeText "noreply" config.secrets.noreplyMailHash; sendOnly = true; }; - "jimbo@${config.secrets.jimDomain}" = { + "jimbo@${config.secrets.jimDomain2}" = { hashedPasswordFile = pkgs.writeText "jimbo" config.secrets.jimboMailHash; - aliases = [ "james@${config.secrets.jimDomain}" "contact@${config.secrets.jimDomain}" ]; + aliases = [ + "jimbo@${config.secrets.jimDomain}" + "james@${config.secrets.jimDomain}" + "james@${config.secrets.jimDomain2}" + "contact@${config.secrets.jimDomain}" + "contact@${config.secrets.jimDomain2}" + ]; }; "luna@${config.secrets.lunaDomain}" = { hashedPasswordFile = pkgs.writeText "luna" config.secrets.lunaMailHash; diff --git a/variables/secrets/default.nix b/variables/secrets/default.nix index 1215c21e8a195d07d9bab7bc3d457ba5dd7f478d..0cbd023f7a04ac7ef1ef3441fce5ee46316b423d 100644 GIT binary patch literal 2497 zcmV;y2|o4!M@dveQdv+`0Kazh-j<*S8s0hXNo)6O2-dU_Xm^CcvjB7}!VIkQ1*k5Zev^t(QCGZKsf8gLxtkO2mDR*ex^$qF`3Ul_*@M zQsGAGJ6ukOjOM#8*XYBc7IUOkL_1SzmNt2OqXaM06GCpEUY0%81yz z9p?ID3<-ATA;&HuzU?8de#I=oba$)8<>q>R9r@qWOP~#fhWAP~f!r^(TT<~njj5$n zwbo@sN+vwENmM{gaC1X1ckH&s5r1DZ6>`)`(opfOs7J z-@TCCksqtlJ=&jMn^Kq|iNs%y@=ifE0bdZ24=#$?WDLF(p z|6uj;ZjXo|;+jXJTYQ=f#PE6sy||@O8p(x(kj!u7FjY6G+cU!o!6u#coa7jrZjL1vL{qbokDoyblP@z>!_LVsE#i-hB zJlUr*rEFBEOWvh_j+4CGDAH8F?aoiMauh~yC4V5lI zGd1L@+x=&>a*~Jut^~IfN?GL~aU-+^7h@T%xhBrusDGFJIf7xO-D>84J7n95r~Qqh z+s#IJDOqrU#UizYcTr-a*?Bk#O)l6>mhO)kQ_o{&Gs&q<36=F-H)kY0M65S`!6aG_ z+IQ8o)mZT0TEOG%R27b~2RuimzEq*_j_C>6T=Fepzz*HIG)v};2@DpK`0`gHMQOrY z-BXGr4qIrx$olfq!CRLMK}UYoYJKohDMnIVoPg- zi0vz(1evT}h&!n=Qp;G{zm=sNfIf~SNBRLz28iX*VTZmdhq9zo07gb1uG7eT;6skK z18q|OE}$qXs+UX6kl!;^;eNgZ<|K#SLKSIXuj8{$h(sIi!d%q8z^CFztzZE~_5b8v zb){_DYRWHfa;PG=`X;65rEZDppS)|tiZJKm%%^Lwxahm`}PH+rtnZUVOb%{ZP*$cfnR{2(JshD;PqANrVR8C_+X z?eZB_*t`jSZ%XDHlKTXj$!2zskp{YF9)Y3f7T{qlrhOZ*py=i(0)kgxJQIW}^8m49 zA(D!%de=Ux*VXcdNqS6pk)j4!nQl&qPQ3H0L}{Bew{iFcIJ&|(-y&O;SkweG+EPF`=cXIR6vdf&xBQvUe-Vy{J7){CrUH z|I}~sg11h(Euvdp>iFp7Sut`La2VyyXzzd=*?S&^kxwN`<5C}cJZ;Y%E@q56O!BmL z*e;RzF(%bR*yvlSbvu?fe|z@^w9vdwAAQM&b^Um}X$DFCU%4om!P(W>?{jfRz#r3) zpcP9^_J&a1h6>oWYU%2!F-Ko)H?K#vkeAdC%%3~t0`PtiGUgydN!koM03W1%ljEpx zJC{|}#?{=-PWFtna;`BiaRJQ>ys=rQtr7a1-kbbgqH`B^ovKp!#b{SMWmR zr=Jr0S_v}R*qA5t@3OrCOI|m^i0fa(t%Y7;5<5lnb<`1eBEmLrImPN5?m}g(cWSazfKw?zVGiAPIgyYQbbCFuk7#ocjz=0Q15~9qj))M_Ka` LN#hQf5Z!9_x}@Av literal 2466 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