From 4a9f6a8983bedd27de4b2a9e93c1f81476e0d70c Mon Sep 17 00:00:00 2001
From: Richie Cahill <Richie@tmmworkshop.com>
Date: Mon, 15 Apr 2024 00:28:59 -0400
Subject: [PATCH] updated fail2ban module

---
 modules/fail2ban.nix      | 16 +++-------------
 systems/configuration.nix |  4 ----
 2 files changed, 3 insertions(+), 17 deletions(-)

diff --git a/modules/fail2ban.nix b/modules/fail2ban.nix
index 890525a..12ad61c 100644
--- a/modules/fail2ban.nix
+++ b/modules/fail2ban.nix
@@ -1,17 +1,7 @@
+{ config, lib, ... }:
 {
-  config,
-  lib,
-  libS,
-  ...
-}:
-
-let
-  cfg = config.services.fail2ban;
-in
-{
-  options.services.fail2ban.recommendedDefaults = libS.mkOpinionatedOption "use fail2ban with recommended defaults";
-
-  config.services.fail2ban = lib.mkIf cfg.recommendedDefaults {
+  services.fail2ban = {
+    enable = lib.mkIf config.networking.firewall.enable (lib.mkDefault true);
     maxretry = 5;
     bantime = "24h";
     bantime-increment = {
diff --git a/systems/configuration.nix b/systems/configuration.nix
index 90807e3..27c3342 100644
--- a/systems/configuration.nix
+++ b/systems/configuration.nix
@@ -22,10 +22,6 @@
   };
 
   services = {
-    fail2ban = {
-      enable = lib.mkIf config.networking.firewall.enable (lib.mkDefault true);
-      recommendedDefaults = true;
-    };
 
     autopull = {
       enable = true;