diff --git a/hosts/sobotka/server.nix b/hosts/sobotka/server.nix index 5b4a715f..6d6d621c 100644 --- a/hosts/sobotka/server.nix +++ b/hosts/sobotka/server.nix @@ -5,7 +5,7 @@ caddy = { enable = true; }; - cfFail2ban = { + fail2ban = { enable = true; apiKeyFile = config.age.secrets.cloudflareFirewallApiKey.path; zoneId = "0027acdfb8bbe010f55b676ad8698dfb"; diff --git a/modules/default.nix b/modules/default.nix index 556f03e8..9f7e6cdd 100644 --- a/modules/default.nix +++ b/modules/default.nix @@ -121,7 +121,7 @@ imports = [ ./server ./server/caddy - ./server/cfFail2ban + ./server/fail2ban ./server/vaultwarden ]; }; diff --git a/modules/server/cfFail2ban/default.nix b/modules/server/fail2ban/default.nix similarity index 98% rename from modules/server/cfFail2ban/default.nix rename to modules/server/fail2ban/default.nix index 5d4bdfcf..e931fdff 100644 --- a/modules/server/cfFail2ban/default.nix +++ b/modules/server/fail2ban/default.nix @@ -5,9 +5,9 @@ pkgs, ... }: let - cfg = config.server.cfFail2ban; + cfg = config.server.fail2ban; in { - options.server.cfFail2ban = { + options.server.fail2ban = { enable = lib.mkEnableOption { description = "Enable cloudflare fail2ban"; }; diff --git a/modules/server/vaultwarden/default.nix b/modules/server/vaultwarden/default.nix index 40f3ae2a..7292d4d7 100644 --- a/modules/server/vaultwarden/default.nix +++ b/modules/server/vaultwarden/default.nix @@ -37,8 +37,8 @@ in { } ''; - services = { - cfFail2ban = lib.mkIf config.server.cfFail2ban.enable { + server = { + fail2ban = lib.mkIf config.server.fail2ban.enable { jails = { vaultwarden = { serviceName = "vaultwarden";