moved fail2ban configs into service configs

modules/nixos-modules/server/fail2ban.nix

@@ -20,18 +20,6 @@ in {
             failregex = "limiting requests, excess:.* by zone.*client: <HOST>"
           '')
         );
-        "fail2ban/filter.d/jellyfin.local".text = lib.mkIf config.services.jellyfin.enable (
-          pkgs.lib.mkDefault (pkgs.lib.mkAfter ''
-            [Definition]
-            failregex = "^.*Authentication request for .* has been denied \\\(IP: \"<ADDR>\"\\\)\\\."
-          '')
-        );
-        "fail2ban/filter.d/forgejo.local".text = lib.mkIf config.services.forgejo.enable (
-          pkgs.lib.mkDefault (pkgs.lib.mkAfter ''
-            [Definition]
-            failregex = ".*(Failed authentication attempt|invalid credentials|Attempted access of unknown user).* from <HOST>"
-          '')
-        );
         # "fail2ban/filter.d/hass.local".text = lib.mkIf config.services.home-assistant.enable (
         #   pkgs.lib.mkDefault (pkgs.lib.mkAfter ''
         #     [INCLUDES]
@@ -46,13 +34,6 @@ in {
         #     datepattern = ^%%Y-%%m-%%d %%H:%%M:%%S
         #   '')
         # );
-        "fail2ban/filter.d/immich.local".text = lib.mkIf config.services.immich.enable (
-          pkgs.lib.mkDefault (pkgs.lib.mkAfter ''
-            [Definition]
-            failregex = immich-server.*Failed login attempt for user.+from ip address\s?<ADDR>
-            journalmatch = CONTAINER_TAG=immich-server
-          '')
-        );
       };
 
       services.fail2ban = {
@@ -85,26 +66,6 @@ in {
             bantime = 600;
             maxretry = 5;
           };
-          jellyfin-iptables.settings = lib.mkIf config.services.jellyfin.enable {
-            enabled = true;
-            filter = "jellyfin";
-            action = ''iptables-multiport[name=HTTP, port="http,https"]'';
-            logpath = "${config.services.jellyfin.dataDir}/log/*.log";
-            backend = "auto";
-            findtime = 600;
-            bantime = 600;
-            maxretry = 5;
-          };
-          forgejo-iptables.settings = lib.mkIf config.services.forgejo.enable {
-            enabled = true;
-            filter = "forgejo";
-            action = ''iptables-multiport[name=HTTP, port="http,https"]'';
-            logpath = "${config.services.forgejo.settings.log.ROOT_PATH}/*.log";
-            backend = "auto";
-            findtime = 600;
-            bantime = 600;
-            maxretry = 5;
-          };
           # home-assistant-iptables.settings = lib.mkIf config.services.home-assistant.enable {
           #   enabled = true;
           #   filter = "hass";
@@ -115,11 +76,6 @@ in {
           #   bantime = 600;
           #   maxretry = 5;
           # };
-          immich-iptables.settings = lib.mkIf config.services.immich.enable {
-            enabled = true;
-            filter = "immich";
-            backend = "systemd";
-          };
           # TODO; figure out if there is any fail2ban things we can do on searx
           # searx-iptables.settings = lib.mkIf config.services.searx.enable {};
         };

modules/nixos-modules/server/forgejo.nix

@@ -1,6 +1,7 @@
 {
   lib,
   config,
+  pkgs,
   ...
 }: let
   forgejoPort = 8081;
@@ -67,6 +68,31 @@ in {
         config.services.forgejo.settings.server.SSH_LISTEN_PORT
       ];
     }
+    (lib.mkIf config.services.fail2ban.enable {
+      environment.etc = {
+        "fail2ban/filter.d/forgejo.local".text = lib.mkIf config.services.forgejo.enable (
+          pkgs.lib.mkDefault (pkgs.lib.mkAfter ''
+            [Definition]
+            failregex = ".*(Failed authentication attempt|invalid credentials|Attempted access of unknown user).* from <HOST>"
+          '')
+        );
+      };
+
+      services.fail2ban = {
+        jails = {
+          forgejo-iptables.settings = lib.mkIf config.services.forgejo.enable {
+            enabled = true;
+            filter = "forgejo";
+            action = ''iptables-multiport[name=HTTP, port="http,https"]'';
+            logpath = "${config.services.forgejo.settings.log.ROOT_PATH}/*.log";
+            backend = "auto";
+            findtime = 600;
+            bantime = 600;
+            maxretry = 5;
+          };
+        };
+      };
+    })
     (lib.mkIf config.host.impermanence.enable {
       assertions = [
         {

modules/nixos-modules/server/immich.nix

@@ -1,6 +1,7 @@
 {
   lib,
   config,
+  pkgs,
   ...
 }: let
   mediaLocation = "/var/lib/immich";
@@ -59,6 +60,27 @@ in {
         ];
       };
     }
+    (lib.mkIf config.services.fail2ban.enable {
+      environment.etc = {
+        "fail2ban/filter.d/immich.local".text = lib.mkIf config.services.immich.enable (
+          pkgs.lib.mkDefault (pkgs.lib.mkAfter ''
+            [Definition]
+            failregex = immich-server.*Failed login attempt for user.+from ip address\s?<ADDR>
+            journalmatch = CONTAINER_TAG=immich-server
+          '')
+        );
+      };
+
+      services.fail2ban = {
+        jails = {
+          immich-iptables.settings = lib.mkIf config.services.immich.enable {
+            enabled = true;
+            filter = "immich";
+            backend = "systemd";
+          };
+        };
+      };
+    })
     (lib.mkIf config.host.impermanence.enable {
       assertions = [
         {

modules/nixos-modules/server/jellyfin.nix

@@ -53,6 +53,31 @@ in {
           pkgs.jellyfin-ffmpeg
         ];
       }
+      (lib.mkIf config.services.fail2ban.enable {
+        environment.etc = {
+          "fail2ban/filter.d/jellyfin.local".text = lib.mkIf config.services.jellyfin.enable (
+            pkgs.lib.mkDefault (pkgs.lib.mkAfter ''
+              [Definition]
+              failregex = "^.*Authentication request for .* has been denied \\\(IP: \"<ADDR>\"\\\)\\\."
+            '')
+          );
+        };
+
+        services.fail2ban = {
+          jails = {
+            jellyfin-iptables.settings = lib.mkIf config.services.jellyfin.enable {
+              enabled = true;
+              filter = "jellyfin";
+              action = ''iptables-multiport[name=HTTP, port="http,https"]'';
+              logpath = "${config.services.jellyfin.dataDir}/log/*.log";
+              backend = "auto";
+              findtime = 600;
+              bantime = 600;
+              maxretry = 5;
+            };
+          };
+        };
+      })
       (lib.mkIf config.host.impermanence.enable {
         fileSystems."/persist/system/jellyfin".neededForBoot = true;