diff options
| author | Ryan Lahfa <masterancpp@gmail.com> | 2023-03-27 21:59:57 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-03-27 21:59:57 +0200 |
| commit | 482c735228dff6161fd8616a471876d11eb066b8 (patch) | |
| tree | e9cf838a46d40d24cbb0c7651dace6e1a5266fb9 | |
| parent | 4bb072f0a8b267613c127684e099a70e1f6ff106 (diff) | |
| parent | 9b60eef4bdcb63b0a51e260d6fec79ff53f9d67b (diff) | |
Merge pull request #223388 from 06kellyjac/authelia-move
authelia: move module under security and minor fixes
| -rw-r--r-- | nixos/modules/module-list.nix | 2 | ||||
| -rw-r--r-- | nixos/modules/services/security/authelia.nix (renamed from nixos/modules/services/web-servers/authelia.nix) | 0 | ||||
| -rw-r--r-- | nixos/tests/authelia.nix | 2 | ||||
| -rw-r--r-- | pkgs/servers/authelia/default.nix | 3 |
4 files changed, 4 insertions, 3 deletions
diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix index 23ffb81b6a4ee..abd88d285a998 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 index 143c441c7e153..143c441c7e153 100644 --- a/nixos/modules/services/web-servers/authelia.nix +++ b/nixos/modules/services/security/authelia.nix diff --git a/nixos/tests/authelia.nix b/nixos/tests/authelia.nix index 7c239ebdd5af4..679c65fea087a 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 3e71fc7765620..4a2ed9bd57296 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; { |