flora: replace mailserver with ntfy.sh

not sure how permanent this will be, but for now it allows me to do some
things that would otherwise be hard.

3 files changed, 13 insertions, 13 deletions

diff --git a/flora/services/mail.nix b/flora/services/mail.nix
index 3987a49..523c32d 100644
--- a/flora/services/mail.nix
+++ b/flora/services/mail.nix
@@ -6,7 +6,7 @@
   sops.secrets."mail/hashedPassword" = {};
 
   mailserver = {
-    enable = true;
+    enable = false;
     fqdn = "mail.stuebinm.eu";
     domains = [ "stuebinm.eu" ];
 
diff --git a/flora/services/monit.nix b/flora/services/monit.nix
index 83436e7..19e7e88 100644
--- a/flora/services/monit.nix
+++ b/flora/services/monit.nix
@@ -16,15 +16,15 @@
             if failed port 64738 of type tcp using ssl with expect "NixOS"
             then alert
 
-      check process postfix with pidfile /var/lib/postfix/queue/pid/master.pid
-            start program = "${pkgs.systemd}/bin/systemctl start postfix"
-            stop program = "${pkgs.systemd}/bin/systemctl stop postfix"
-            if failed port 25 protocol smtp for 5 cycles then restart
-
-      check process dovecot with pidfile /var/run/dovecot2/master.pid
-            start program = "${pkgs.systemd}/bin/systemctl start dovecot2"
-            stop program = "${pkgs.systemd}/bin/systemctl stop dovecot2"
-            if failed host mail.stuebinm.eu port 993 type tcpssl sslauto protocol imap for 5 cycles then restart
+      # check process postfix with pidfile /var/lib/postfix/queue/pid/master.pid
+      #       start program = "${pkgs.systemd}/bin/systemctl start postfix"
+      #       stop program = "${pkgs.systemd}/bin/systemctl stop postfix"
+      #       if failed port 25 protocol smtp for 5 cycles then restart
+
+      # check process dovecot with pidfile /var/run/dovecot2/master.pid
+      #       start program = "${pkgs.systemd}/bin/systemctl start dovecot2"
+      #       stop program = "${pkgs.systemd}/bin/systemctl stop dovecot2"
+      #       if failed host mail.stuebinm.eu port 993 type tcpssl sslauto protocol imap for 5 cycles then restart
 
       check host bahnhof.name with address bahnhof.name
             if failed port 443 with protocol https
diff --git a/flora/services/ntfy.nix b/flora/services/ntfy.nix
index aa46a39..25ae8f8 100644
--- a/flora/services/ntfy.nix
+++ b/flora/services/ntfy.nix
@@ -10,8 +10,8 @@
       listen-unix = "/run/ntfy-sh/ntfy.sock";
       listen-unix-mode = 511; ## lossy nix->yaml conversion eats octal literals (equal to 0777)
 
-      smtp-server-listen = ":2525";
-      smtp-server-domain = "ping.stuebinm.eu";
+      smtp-server-listen = ":25";
+      smtp-server-domain = "mail.stuebinm.eu";
 
       auth-file = "/var/lib/ntfy-sh/user.db";
       auth-default-access = "deny-all";
@@ -21,7 +21,7 @@
     };
   };
 
-  networking.firewall.allowedTCPPorts = [ 2525 ];
+  networking.firewall.allowedTCPPorts = [ 25 ];
 
   services.mollysocket = {
     enable = true;