From 9b60eef4bdcb63b0a51e260d6fec79ff53f9d67b Mon Sep 17 00:00:00 2001
From: 06kellyjac <dev@j-k.io>
Date: Mon, 27 Mar 2023 12:00:07 +0100
Subject: [PATCH] authelia: move module under security and minor fixes

Fixed test access to lib
Added nixos test to passthru
---
 nixos/modules/module-list.nix                                 | 2 +-
 nixos/modules/services/{web-servers => security}/authelia.nix | 0
 nixos/tests/authelia.nix                                      | 2 +-
 pkgs/servers/authelia/default.nix                             | 3 ++-
 4 files changed, 4 insertions(+), 3 deletions(-)
 rename nixos/modules/services/{web-servers => security}/authelia.nix (100%)

diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix
index 23ffb81b6a4..abd88d285a9 100644
--- a/nixos/modules/module-list.nix
+++ b/nixos/modules/module-list.nix
@@ -1063,6 +1063,7 @@
   ./services/search/opensearch.nix
   ./services/search/qdrant.nix
   ./services/security/aesmd.nix
+  ./services/security/authelia.nix
   ./services/security/certmgr.nix
   ./services/security/cfssl.nix
   ./services/security/clamav.nix
@@ -1210,7 +1211,6 @@
   ./services/web-apps/zabbix.nix
   ./services/web-servers/agate.nix
   ./services/web-servers/apache-httpd/default.nix
-  ./services/web-servers/authelia.nix
   ./services/web-servers/caddy/default.nix
   ./services/web-servers/darkhttpd.nix
   ./services/web-servers/fcgiwrap.nix
diff --git a/nixos/modules/services/web-servers/authelia.nix b/nixos/modules/services/security/authelia.nix
similarity index 100%
rename from nixos/modules/services/web-servers/authelia.nix
rename to nixos/modules/services/security/authelia.nix
diff --git a/nixos/tests/authelia.nix b/nixos/tests/authelia.nix
index 7c239ebdd5a..679c65fea08 100644
--- a/nixos/tests/authelia.nix
+++ b/nixos/tests/authelia.nix
@@ -1,5 +1,5 @@
 # Test Authelia as an auth server for Traefik as a reverse proxy of a local web service
-import ./make-test-python.nix ({ pkgs, ... }: {
+import ./make-test-python.nix ({ lib, ... }: {
   name = "authelia";
   meta.maintainers = with lib.maintainers; [ jk ];
 
diff --git a/pkgs/servers/authelia/default.nix b/pkgs/servers/authelia/default.nix
index 3e71fc77656..4a2ed9bd572 100644
--- a/pkgs/servers/authelia/default.nix
+++ b/pkgs/servers/authelia/default.nix
@@ -1,4 +1,4 @@
-{ lib, fetchFromGitHub, buildGoModule, installShellFiles, callPackage }:
+{ lib, fetchFromGitHub, buildGoModule, installShellFiles, callPackage, nixosTests }:
 
 let
   inherit (import ./sources.nix { inherit fetchFromGitHub; }) pname version src vendorHash;
@@ -56,6 +56,7 @@ buildGoModule rec {
     # if overriding replace the postPatch to put your web UI output in internal/server/public_html
     inherit web;
     updateScript = ./update.sh;
+    tests = { inherit (nixosTests) authelia; };
   };
 
   meta = with lib; {