tests: move fail2ban tests into subdirectory

This commit is contained in:
2026-04-20 17:25:45 -04:00
parent 9ddef4bd54
commit b99a039ab0
8 changed files with 23 additions and 23 deletions

View File

@@ -17,7 +17,7 @@ pkgs.testers.runNixOSTest {
}:
{
imports = [
../modules/server-security.nix
../../modules/server-security.nix
];
# Set up Caddy with basic auth (minimal config, no production stuff)

View File

@@ -5,7 +5,7 @@
...
}:
let
baseServiceConfigs = import ../hosts/muffin/service-configs.nix;
baseServiceConfigs = import ../../hosts/muffin/service-configs.nix;
testServiceConfigs = lib.recursiveUpdate baseServiceConfigs {
zpool_ssds = "";
gitea = {
@@ -32,7 +32,7 @@ let
{ config, pkgs, ... }:
{
imports = [
(import ../services/gitea/gitea.nix {
(import ../../services/gitea/gitea.nix {
inherit config pkgs;
lib = testLib;
service_configs = testServiceConfigs;
@@ -53,7 +53,7 @@ pkgs.testers.runNixOSTest {
}:
{
imports = [
../modules/server-security.nix
../../modules/server-security.nix
giteaModule
];

View File

@@ -5,7 +5,7 @@
...
}:
let
baseServiceConfigs = import ../hosts/muffin/service-configs.nix;
baseServiceConfigs = import ../../hosts/muffin/service-configs.nix;
testServiceConfigs = lib.recursiveUpdate baseServiceConfigs {
zpool_ssds = "";
https.domain = "test.local";
@@ -30,7 +30,7 @@ let
{ config, pkgs, ... }:
{
imports = [
(import ../services/immich.nix {
(import ../../services/immich.nix {
inherit config pkgs;
lib = testLib;
service_configs = testServiceConfigs;
@@ -51,7 +51,7 @@ pkgs.testers.runNixOSTest {
}:
{
imports = [
../modules/server-security.nix
../../modules/server-security.nix
immichModule
];

View File

@@ -5,7 +5,7 @@
...
}:
let
baseServiceConfigs = import ../hosts/muffin/service-configs.nix;
baseServiceConfigs = import ../../hosts/muffin/service-configs.nix;
testServiceConfigs = lib.recursiveUpdate baseServiceConfigs {
zpool_ssds = "";
https.domain = "test.local";
@@ -30,7 +30,7 @@ let
{ config, pkgs, ... }:
{
imports = [
(import ../services/jellyfin/jellyfin.nix {
(import ../../services/jellyfin/jellyfin.nix {
inherit config pkgs;
lib = testLib;
service_configs = testServiceConfigs;
@@ -51,7 +51,7 @@ pkgs.testers.runNixOSTest {
}:
{
imports = [
../modules/server-security.nix
../../modules/server-security.nix
jellyfinModule
];

View File

@@ -17,7 +17,7 @@ pkgs.testers.runNixOSTest {
}:
{
imports = [
../modules/server-security.nix
../../modules/server-security.nix
];
# Minimal Caddy that stands in for the llama-cpp reverse_proxy.

View File

@@ -5,7 +5,7 @@
...
}:
let
securityModule = import ../modules/server-security.nix;
securityModule = import ../../modules/server-security.nix;
sshModule =
{
@@ -16,7 +16,7 @@ let
}:
{
imports = [
(import ../services/ssh.nix {
(import ../../services/ssh.nix {
inherit config lib pkgs;
username = "testuser";
})

View File

@@ -5,7 +5,7 @@
...
}:
let
baseServiceConfigs = import ../hosts/muffin/service-configs.nix;
baseServiceConfigs = import ../../hosts/muffin/service-configs.nix;
testServiceConfigs = lib.recursiveUpdate baseServiceConfigs {
zpool_ssds = "";
https.domain = "test.local";
@@ -25,7 +25,7 @@ let
{ config, pkgs, ... }:
{
imports = [
(import ../services/bitwarden.nix {
(import ../../services/bitwarden.nix {
inherit config pkgs;
lib = testLib;
service_configs = testServiceConfigs;
@@ -46,7 +46,7 @@ pkgs.testers.runNixOSTest {
}:
{
imports = [
../modules/server-security.nix
../../modules/server-security.nix
vaultwardenModule
];

View File

@@ -15,13 +15,13 @@ in
filePermsTest = handleTest ./file-perms.nix;
# fail2ban tests
fail2banSshTest = handleTest ./fail2ban-ssh.nix;
fail2banCaddyTest = handleTest ./fail2ban-caddy.nix;
fail2banGiteaTest = handleTest ./fail2ban-gitea.nix;
fail2banVaultwardenTest = handleTest ./fail2ban-vaultwarden.nix;
fail2banImmichTest = handleTest ./fail2ban-immich.nix;
fail2banJellyfinTest = handleTest ./fail2ban-jellyfin.nix;
fail2banLlamaCppTest = handleTest ./fail2ban-llama-cpp.nix;
fail2banSshTest = handleTest ./fail2ban/ssh.nix;
fail2banCaddyTest = handleTest ./fail2ban/caddy.nix;
fail2banGiteaTest = handleTest ./fail2ban/gitea.nix;
fail2banVaultwardenTest = handleTest ./fail2ban/vaultwarden.nix;
fail2banImmichTest = handleTest ./fail2ban/immich.nix;
fail2banJellyfinTest = handleTest ./fail2ban/jellyfin.nix;
fail2banLlamaCppTest = handleTest ./fail2ban/llama-cpp.nix;
# jellyfin annotation service test
jellyfinAnnotationsTest = handleTest ./jellyfin-annotations.nix;