flake.lock: update

feat(service): remove ntfy

flake.lock

@@ -118,11 +118,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1774647770,
-        "narHash": "sha256-UNNi14XiqRWWjO8ykbFwA5wRwx7EscsC+GItOVpuGjc=",
+        "lastModified": 1775360939,
+        "narHash": "sha256-XUBlSgUFdvTh6+K5LcI5mJu5F5L8scmJDMRiZM484TM=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "02371c05a04a2876cf92e2d67a259e8f87399068",
+        "rev": "2097a5c82bdc099c6135eae4b111b78124604554",
         "type": "github"
       },
       "original": {
@@ -206,11 +206,11 @@
         "xdph": "xdph"
       },
       "locked": {
-        "lastModified": 1774635054,
-        "narHash": "sha256-NVjEJ5u0VHKTc/A17kWDfXgFnBAsP2BOMNj+fAv58mM=",
+        "lastModified": 1775343634,
+        "narHash": "sha256-y5X04LWh/RDH7FE3y1xEDD+RP8mkfGGiXXZ9u0hky2g=",
         "owner": "hyprwm",
         "repo": "Hyprland",
-        "rev": "5dfb1033a433789021ab9f94b9044e6f32496211",
+        "rev": "3a7bd8fea2ca9711da5523dc185c05ea30ec0f35",
         "type": "github"
       },
       "original": {
@@ -468,11 +468,11 @@
     },
     "nixpkgs_2": {
       "locked": {
-        "lastModified": 1774273680,
-        "narHash": "sha256-a++tZ1RQsDb1I0NHrFwdGuRlR5TORvCEUksM459wKUA=",
+        "lastModified": 1775126147,
+        "narHash": "sha256-J0dZU4atgcfo4QvM9D92uQ0Oe1eLTxBVXjJzdEMQpD0=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "fdc7b8f7b30fdbedec91b71ed82f36e1637483ed",
+        "rev": "8d8c1fa5b412c223ffa47410867813290cdedfef",
         "type": "github"
       },
       "original": {
@@ -594,11 +594,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1774303811,
-        "narHash": "sha256-fhG4JAcLgjKwt+XHbjs8brpWnyKUfU4LikLm3s0Q/ic=",
+        "lastModified": 1775365543,
+        "narHash": "sha256-f50qrK0WwZ9z5EdaMGWOTtALgSF7yb7XwuE7LjCuDmw=",
         "owner": "Mic92",
         "repo": "sops-nix",
-        "rev": "614e256310e0a4f8a9ccae3fa80c11844fba7042",
+        "rev": "a4ee2de76efb759fe8d4868c33dec9937897916f",
         "type": "github"
       },
       "original": {

machines/bomba/networking.nix

@@ -10,8 +10,13 @@ in
       enable = true;
       allowedTCPPorts = [
         22
+        25
         80
+        143
         443
+        465
+        587
+        993
       ];
       allowedUDPPorts = [
         80

machines/bomba/secrets.nix

@@ -7,11 +7,11 @@
         sopsFile = ../../secrets/bomba.sops.yaml;
       };
       ntfy_users = {
-        owner = "ntfy-sh";
+        # owner = "ntfy-sh";
         sopsFile = ../../secrets/bomba.sops.yaml;
       };
       ntfy_access = {
-        owner = "ntfy-sh";
+        # owner = "ntfy-sh";
         sopsFile = ../../secrets/bomba.sops.yaml;
       };
     };

machines/bomba/services/default.nix

@@ -5,6 +5,7 @@
     ./gitea.nix
     ./nextcloud.nix
     ./ntfy.nix
+    ./maddy.nix
     ./octoprint.nix
     ./vaultwarden.nix
   ];

machines/bomba/services/maddy.nix

@@ -0,0 +1,41 @@
+{
+  pkgs,
+  config,
+  options,
+  currentSystemEmail,
+  ...
+}:
+{
+  services.maddy = {
+    enable = true;
+    primaryDomain = "patrickcanal.it";
+    ensureAccounts = [
+      "postmaster@patrickcanal.it"
+      "test@patrickcanal.it"
+    ];
+    ensureCredentials = {
+      "postmaster@patrickcanal.it".passwordFile = "${pkgs.writeText "postmaster" "test"}";
+      "test@patrickcanal.it".passwordFile = "${pkgs.writeText "test" "test"}";
+    };
+    tls = {
+      loader = "file";
+      certificates = [
+        {
+          keyPath = "/etc/ssl/certs/privkey.pem";
+          certPath = "/etc/ssl/certs/fullchain.pem";
+        }
+      ];
+    };
+    config =
+      builtins.replaceStrings
+        [
+          "imap tcp://0.0.0.0:143"
+          "submission tcp://0.0.0.0:587"
+        ]
+        [
+          "imap tls://0.0.0.0:993 tcp://0.0.0.0:143"
+          "submission tls://0.0.0.0:465 tcp://0.0.0.0:587"
+        ]
+        options.services.maddy.config.default;
+  };
+}

machines/bomba/services/ntfy.nix

@@ -1,16 +1,16 @@
 { config, ... }:
 {
-  services.ntfy-sh = {
-    enable = true;
-    environmentFile = config.sops.templates."ntfy.env".path;
-    settings = {
-      listen-http = ":8005";
-      base-url = "https://ntfy.patrickcanal.it";
-      smtp-server-listen = ":25";
-      smtp-server-domain = "patrickcanal.it";
-      behind-proxy = true;
-      enable-login = true;
-      require-login = true;
-    };
-  };
+  # services.ntfy-sh = {
+  #   enable = false;
+  #   environmentFile = config.sops.templates."ntfy.env".path;
+  #   settings = {
+  #     listen-http = ":8005";
+  #     base-url = "https://ntfy.patrickcanal.it";
+  #     smtp-server-listen = ":25";
+  #     smtp-server-domain = "patrickcanal.it";
+  #     behind-proxy = true;
+  #     enable-login = true;
+  #     require-login = true;
+  #   };
+  # };
 }