update email, deploy-rs

modules/backup.nix

@@ -4,7 +4,7 @@
   services.restic.backups.backup = {
     repository = "rest:http://10.0.0.4:8000/backup";
     initialize = true;
-    passwordFile = "/home/lilac/test-password";
+    passwordFile = config.sops.secrets.mxpass.path;
     paths = [ "/var/lib/immich" "/var/lib/music" "/var/lib/gitea" "/var/lib/vault-backup" ];
     timerConfig.OnCalendar = "03:30";
     pruneOpts = [ "--keep-daily 7" "--keep-weekly 4" "--keep-monthly 12" ];

modules/mail.nix

@@ -7,7 +7,7 @@
     ensureAccounts = [ "lilac@grasswren.net" ];
     ensureCredentials."lilac@grasswren.net".passwordFile = config.sops.secrets.mxpass.path;
 
-    secrets = [ config.sops.secrets.cftoken.path ];
+    secrets = [ config.sops.secrets.cftoken.path config.sops.secrets.s2guser.path config.sops.secrets.s2gpass.path ];
 
     tls = {
       loader = "acme";
@@ -39,6 +39,13 @@
         dsn mailbox.db
       }
 
+      target.smtp relay {
+        hostname $(hostname)
+        starttls yes
+        auth plain "{env:S2GUSER}" "{env:S2GPASS}"
+        targets tcp://mail.smtp2go.com:587
+      }
+
       smtp tcp://0.0.0.0:25 {
         default_source {
           destination grasswren.net {
@@ -53,6 +60,16 @@
         }
       }
 
+      submission tls://0.0.0.0:587 {
+        auth &local_authdb
+
+        default_source {
+          default_destination {
+            deliver_to &relay
+          }
+        }
+      }
+
       imap tls://0.0.0.0:993 {
         auth &local_authdb
         storage &local_mailboxes

modules/secrets.nix

@@ -17,4 +17,18 @@
     mode = "0440";
     restartUnits = [ "maddy.service" ];
   };
+
+  sops.secrets.s2guser = {
+    owner = "maddy";
+    group = "maddy";
+    mode = "0440";
+    restartUnits = [ "maddy.service" ];
+  };
+
+  sops.secrets.s2gpass = {
+    owner = "maddy";
+    group = "maddy";
+    mode = "0440";
+    restartUnits = [ "maddy.service" ];
+  };
 }