cluster/services/mail: move from VEGAS/mail

cluster/services/mail/certificate.nix

@@ -1,11 +1,6 @@
 { depot, lib, ... }:
-{
-  imports = [
-    ./imap.nix
-    ./opendkim.nix
-    ./postfix.nix
-  ];
 
+{
   security.acme.certs."mail.${depot.lib.meta.domain}" = {
     dnsProvider = "exec";
     webroot = lib.mkForce null;

cluster/services/mail/default.nix

@@ -1,6 +1,24 @@
 { depot, ... }:
 
 {
+  services.mail = {
+    nodes = {
+      smtp = [ "VEGAS" ];
+      imap = [ "VEGAS" ];
+    };
+    nixos = {
+      smtp = [
+        ./postfix.nix
+        ./opendkim.nix
+        ./certificate.nix
+      ];
+      imap = [
+        ./imap.nix
+        ./certificate.nix
+      ];
+    };
+  };
+
   dns.records = let
     inherit (depot.lib.meta) domain adminEmail;
     mailServerAddr = depot.hours.VEGAS.interfaces.primary.addrPublic;

cluster/services/mail/imap.nix

@@ -32,7 +32,7 @@ let
   '';
 in {
 
-  age.secrets.dovecotLdapToken.file = ../../../../secrets/dovecot-ldap-token.age;
+  age.secrets.dovecotLdapToken.file = ../../../secrets/dovecot-ldap-token.age;
 
   networking.firewall.allowedTCPPorts = [ 143 993 ];
 

cluster/services/mail/postfix.nix

@@ -14,7 +14,7 @@ let
 in
 {
   age.secrets."postfix-ldap-mailboxes.cf" = {
-    file = ../../../../secrets/postfix-ldap-mailboxes.age;
+    file = ../../../secrets/postfix-ldap-mailboxes.age;
     owner = "postfix";
     group = "postfix";
     mode = "0400";

hosts/VEGAS/system.nix

@@ -18,7 +18,6 @@
       ./services/backbone-routing
       ./services/cdn-shield
       ./services/jokes
-      ./services/mail
       ./services/minecraft
       ./services/websites
       ./services/wireguard-server