From 8ed67464d0811fdc1f2728e921868cc6c175130e Mon Sep 17 00:00:00 2001 From: Simon Gardling Date: Tue, 20 Jan 2026 19:48:20 -0500 Subject: [PATCH] fmt --- services/gitea.nix | 2 +- services/immich.nix | 2 +- tests/fail2ban-caddy.nix | 7 ++++++- tests/fail2ban-gitea.nix | 12 ++++++++++-- tests/fail2ban-immich.nix | 14 +++++++++++--- tests/fail2ban-jellyfin.nix | 12 ++++++++++-- tests/fail2ban-ssh.nix | 19 ++++++++++++++++--- tests/fail2ban-vaultwarden.nix | 12 ++++++++++-- 8 files changed, 65 insertions(+), 15 deletions(-) diff --git a/services/gitea.nix b/services/gitea.nix index e64f218..5f938df 100644 --- a/services/gitea.nix +++ b/services/gitea.nix @@ -68,7 +68,7 @@ # defaults: maxretry=5, findtime=10m, bantime=10m }; filter.Definition = { - failregex = ''^.*Failed authentication attempt for .* from :.*$''; + failregex = "^.*Failed authentication attempt for .* from :.*$"; ignoreregex = ""; journalmatch = "_SYSTEMD_UNIT=gitea.service"; }; diff --git a/services/immich.nix b/services/immich.nix index ed9a21d..fddd106 100644 --- a/services/immich.nix +++ b/services/immich.nix @@ -52,7 +52,7 @@ # defaults: maxretry=5, findtime=10m, bantime=10m }; filter.Definition = { - failregex = ''^.*Failed login attempt for user .* from ip address .*$''; + failregex = "^.*Failed login attempt for user .* from ip address .*$"; ignoreregex = ""; journalmatch = "_SYSTEMD_UNIT=immich-server.service"; }; diff --git a/tests/fail2ban-caddy.nix b/tests/fail2ban-caddy.nix index 34e46a9..baf7829 100644 --- a/tests/fail2ban-caddy.nix +++ b/tests/fail2ban-caddy.nix @@ -9,7 +9,12 @@ pkgs.testers.runNixOSTest { nodes = { server = - { config, pkgs, lib, ... }: + { + config, + pkgs, + lib, + ... + }: { imports = [ ../modules/security.nix diff --git a/tests/fail2ban-gitea.nix b/tests/fail2ban-gitea.nix index f0688aa..d39b9fd 100644 --- a/tests/fail2ban-gitea.nix +++ b/tests/fail2ban-gitea.nix @@ -21,7 +21,10 @@ let testLib = lib.extend ( final: prev: { - serviceMountWithZpool = serviceName: zpool: dirs: { ... }: { }; + serviceMountWithZpool = + serviceName: zpool: dirs: + { ... }: + { }; } ); @@ -42,7 +45,12 @@ pkgs.testers.runNixOSTest { nodes = { server = - { config, lib, pkgs, ... }: + { + config, + lib, + pkgs, + ... + }: { imports = [ ../modules/security.nix diff --git a/tests/fail2ban-immich.nix b/tests/fail2ban-immich.nix index eae85a8..df4b8a5 100644 --- a/tests/fail2ban-immich.nix +++ b/tests/fail2ban-immich.nix @@ -20,7 +20,10 @@ let testLib = lib.extend ( final: prev: { - serviceMountWithZpool = serviceName: zpool: dirs: { ... }: { }; + serviceMountWithZpool = + serviceName: zpool: dirs: + { ... }: + { }; } ); @@ -41,7 +44,12 @@ pkgs.testers.runNixOSTest { nodes = { server = - { config, lib, pkgs, ... }: + { + config, + lib, + pkgs, + ... + }: { imports = [ ../modules/security.nix @@ -79,7 +87,7 @@ pkgs.testers.runNixOSTest { # Immich needs more resources virtualisation.diskSize = 4 * 1024; - virtualisation.memorySize = 4 * 1024; # 4GB RAM for Immich + virtualisation.memorySize = 4 * 1024; # 4GB RAM for Immich }; client = { diff --git a/tests/fail2ban-jellyfin.nix b/tests/fail2ban-jellyfin.nix index 5fe2ea4..5d88a7f 100644 --- a/tests/fail2ban-jellyfin.nix +++ b/tests/fail2ban-jellyfin.nix @@ -22,7 +22,10 @@ let testLib = lib.extend ( final: prev: { - serviceMountWithZpool = serviceName: zpool: dirs: { ... }: { }; + serviceMountWithZpool = + serviceName: zpool: dirs: + { ... }: + { }; optimizePackage = pkg: pkg; # No-op for testing } ); @@ -44,7 +47,12 @@ pkgs.testers.runNixOSTest { nodes = { server = - { config, lib, pkgs, ... }: + { + config, + lib, + pkgs, + ... + }: { imports = [ ../modules/security.nix diff --git a/tests/fail2ban-ssh.nix b/tests/fail2ban-ssh.nix index 15e8ecf..9730fff 100644 --- a/tests/fail2ban-ssh.nix +++ b/tests/fail2ban-ssh.nix @@ -13,7 +13,12 @@ let securityModule = import ../modules/security.nix; sshModule = - { config, lib, pkgs, ... }: + { + config, + lib, + pkgs, + ... + }: { imports = [ (import ../services/ssh.nix { @@ -28,7 +33,12 @@ pkgs.testers.runNixOSTest { nodes = { server = - { config, lib, pkgs, ... }: + { + config, + lib, + pkgs, + ... + }: { imports = [ securityModule @@ -47,7 +57,10 @@ pkgs.testers.runNixOSTest { }; client = { - environment.systemPackages = with pkgs; [ sshpass openssh ]; + environment.systemPackages = with pkgs; [ + sshpass + openssh + ]; }; }; diff --git a/tests/fail2ban-vaultwarden.nix b/tests/fail2ban-vaultwarden.nix index 802c589..dcb7749 100644 --- a/tests/fail2ban-vaultwarden.nix +++ b/tests/fail2ban-vaultwarden.nix @@ -20,7 +20,10 @@ let testLib = lib.extend ( final: prev: { - serviceMountWithZpool = serviceName: zpool: dirs: { ... }: { }; + serviceMountWithZpool = + serviceName: zpool: dirs: + { ... }: + { }; } ); @@ -41,7 +44,12 @@ pkgs.testers.runNixOSTest { nodes = { server = - { config, lib, pkgs, ... }: + { + config, + lib, + pkgs, + ... + }: { imports = [ ../modules/security.nix