From c2e58f1314ce9cc2f6e953677d1b7cbd567170ec Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Motiejus=20Jak=C5=A1tys?= <motiejus@jakstys.lt>
Date: Tue, 27 Aug 2024 08:44:05 +0300
Subject: [PATCH] rm sshguard

---
 hosts/fwminex/configuration.nix       |  1 -
 hosts/mtworx/configuration.nix        |  1 -
 hosts/vno1-gdrx/configuration.nix     |  2 --
 hosts/vno3-rp3b/configuration.nix     |  1 -
 modules/services/default.nix          |  1 -
 modules/services/sshguard/default.nix | 25 -------------------------
 6 files changed, 31 deletions(-)
 delete mode 100644 modules/services/sshguard/default.nix

diff --git a/hosts/fwminex/configuration.nix b/hosts/fwminex/configuration.nix
index 248f775..4a05059 100644
--- a/hosts/fwminex/configuration.nix
+++ b/hosts/fwminex/configuration.nix
@@ -369,7 +369,6 @@ in
     };
 
     services = {
-      sshguard.enable = true;
       gitea.enable = true;
       hass.enable = true;
       syncthing-relay.enable = true;
diff --git a/hosts/mtworx/configuration.nix b/hosts/mtworx/configuration.nix
index 8caecba..aae7787 100644
--- a/hosts/mtworx/configuration.nix
+++ b/hosts/mtworx/configuration.nix
@@ -85,7 +85,6 @@ in
     };
 
     services = {
-      sshguard.enable = false;
       ssh8022.client = {
         enable = true;
         keyfile = config.age.secrets.ssh8022-client.path;
diff --git a/hosts/vno1-gdrx/configuration.nix b/hosts/vno1-gdrx/configuration.nix
index 7bf00ff..f7e7e19 100644
--- a/hosts/vno1-gdrx/configuration.nix
+++ b/hosts/vno1-gdrx/configuration.nix
@@ -70,8 +70,6 @@ in
     };
 
     services = {
-      sshguard.enable = false;
-
       ssh8022.client = {
         enable = true;
         keyfile = config.age.secrets.ssh8022-client.path;
diff --git a/hosts/vno3-rp3b/configuration.nix b/hosts/vno3-rp3b/configuration.nix
index 0d5fba2..09f2ba6 100644
--- a/hosts/vno3-rp3b/configuration.nix
+++ b/hosts/vno3-rp3b/configuration.nix
@@ -78,7 +78,6 @@
     services = {
       tailscale.enable = true;
       node_exporter.enable = true;
-      sshguard.enable = true;
 
       borgstor = {
         enable = true;
diff --git a/modules/services/default.nix b/modules/services/default.nix
index 6db3a81..5b82dd2 100644
--- a/modules/services/default.nix
+++ b/modules/services/default.nix
@@ -19,7 +19,6 @@
     ./postfix
     ./remote-builder
     ./ssh8022
-    ./sshguard
     ./syncthing
     ./syncthing-relay
     ./tailscale
diff --git a/modules/services/sshguard/default.nix b/modules/services/sshguard/default.nix
deleted file mode 100644
index 60ba327..0000000
--- a/modules/services/sshguard/default.nix
+++ /dev/null
@@ -1,25 +0,0 @@
-{
-  config,
-  lib,
-  myData,
-  ...
-}:
-{
-  options.mj.services.sshguard = with lib.types; {
-    enable = lib.mkOption {
-      type = bool;
-      default = false;
-    };
-  };
-
-  config = lib.mkIf config.mj.services.sshguard.enable {
-    services.sshguard = {
-      enable = true;
-      blocktime = 900;
-      whitelist = [
-        "192.168.0.0/16"
-        myData.subnets.tailscale.cidr
-      ] ++ (lib.catAttrs "publicIP" (lib.attrValues myData.hosts));
-    };
-  };
-}