2025-03-12 HEAD master

2 files changed, 18 insertions, 6 deletions

diff --git a/configurations/manwe/default.nix b/configurations/manwe/default.nix
index 326cfa6..d750aa3 100644
--- a/configurations/manwe/default.nix
+++ b/configurations/manwe/default.nix
@@ -6,9 +6,6 @@
 {
   imports = lib.modulesIn ./. |> lib.attrValues;
 
-  # Something is broken there. Not sure why it affects me tho.
-  disabledModules = [ "services/networking/wireguard-networkd.nix" ];
-
   nixfiles.modules = {
     wireguard.server.enable = true;
 
diff --git a/configurations/manwe/mailserver/default.nix b/configurations/manwe/mailserver/default.nix
index 5160604..a02e8ad 100644
--- a/configurations/manwe/mailserver/default.nix
+++ b/configurations/manwe/mailserver/default.nix
@@ -98,13 +98,28 @@
       };
     };
 
-    # https://gitlab.com/simple-nixos-mailserver/nixos-mailserver/-/issues/275#note_1746383655
-    dovecot2.sieve.extensions = [ "fileinto" ];
-
     # https://gitlab.com/simple-nixos-mailserver/nixos-mailserver/-/issues/241
     redis.servers.rspamd.enable = lib.mkForce false;
+
+    prometheus.exporters.postfix = {
+      enable = true;
+      listenAddress = "127.0.0.1";
+      port = 9154;
+    };
   };
 
+  environment.etc."alloy/postfix.alloy".text = with config.services.prometheus.exporters.postfix; ''
+    prometheus.scrape "postfix" {
+      targets = [
+        {
+          __address__ = "${listenAddress}:${toString port}",
+          instance    = "${config.networking.hostName}",
+        },
+      ]
+      forward_to = [prometheus.relabel.default.receiver]
+    }
+  '';
+
   systemd.services.rspamd = {
     requires = lib.mkForce [ "redis-default.service" ];
     after = lib.mkForce [ "redis-default.service" ];