{hosts/server2,modules/mail}: Re-active the old mail server

Running two mail-servers on one system is a total /mess/. Both try to
bind to the same ports, the old stack consists of **5** different
systemd services whilst stalwart-mail's systemd service simply refuses
to stop, etc.

I'm confident that it can work, but it would probably be best to deploy
the new mail-server on server3.

1 files changed, 10 insertions, 10 deletions

diff --git a/modules/by-name/ma/mail/module.nix b/modules/by-name/ma/mail/module.nix
index 4df3b1d..55f2fb8 100644
--- a/modules/by-name/ma/mail/module.nix
+++ b/modules/by-name/ma/mail/module.nix
@@ -5,9 +5,9 @@
 }: let
   cfg = config.vhack.mail;
   all_admins = [
-    # "sils@vhack.eu"
-    # "soispha@vhack.eu"
-    # "nightingale@vhack.eu"
+    "sils@vhack.eu"
+    "soispha@vhack.eu"
+    "nightingale@vhack.eu"
   ];
 in {
   options.vhack.mail = {
@@ -76,9 +76,9 @@ in {
       useFsLayout = true;
 
       extraVirtualAliases = {
-        # "abuse@vhack.eu" = all_admins;
-        # "postmaster@vhack.eu" = all_admins;
-        # "admin@vhack.eu" = all_admins;
+        "abuse@vhack.eu" = all_admins;
+        "postmaster@vhack.eu" = all_admins;
+        "admin@vhack.eu" = all_admins;
       };
 
       mailDirectory = "/var/lib/mail/vmail";
@@ -100,7 +100,7 @@ in {
       certificateFile = "/var/lib/acme/${cfg.fqdn}/fullchain.pem";
 
       domains = [
-        # "vhack.eu"
+        "vhack.eu"
 
         "s-schoeffel.de"
         "b-peetz.de"
@@ -114,9 +114,9 @@ in {
         "sils@vhack.eu" = {
           hashedPassword = "$2b$05$RW/Svgk7iGxvP5W7ZwUZ1e.a3fj4fteevb2MtfFYYD0d1DQ17y9Fm";
         };
-        # "soispha@vhack.eu" = {
-        #   hashedPassword = "$2b$05$XX36sJuHNbTFvi8DFldscOeQBHahluSkiUqD9QGzQaET7NJusSuQW";
-        # };
+        "soispha@vhack.eu" = {
+          hashedPassword = "$2b$05$XX36sJuHNbTFvi8DFldscOeQBHahluSkiUqD9QGzQaET7NJusSuQW";
+        };
 
         "benedikt.peetz@b-peetz.de" = {
           hashedPassword = "$2b$05$MfET8utot2OolPZNASqoDe4VXNoG2chnEWhdfQ2E92mit0TvI2gBy";