tamipes/authentik-nix
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

module: fix media root config

Browse source 
Was changed within upstream commit abc0c2d2a2a0bfb0214798ed6bca9d59359b39f8.

The sole reason this worked was that `settings.storage.media.file.path`
pointed to `./media`, relative to `/var/lib/authentik`.

Update our config accordingly.
This commit is contained in:
Maximilian Bosch 2024-06-02 17:10:01 +02:00
parent e9ae3992d5
commit d4c45b01f2
No known key found for this signature in database
2 changed files with 11 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

2
components/authentik_media_tenant_files_miration.patch
View file

@ -9,7 +9,7 @@ index 40795d460..7ac1efb34 100644
+from authentik.lib.config import CONFIG +from authentik.lib.config import CONFIG
-MEDIA_ROOT = Path(__file__).parent.parent.parent / "media" -MEDIA_ROOT = Path(__file__).parent.parent.parent / "media"
+MEDIA_ROOT = Path(CONFIG.get("paths.media")) +MEDIA_ROOT = Path(CONFIG.get("storage.media.file.path"))
TENANT_MEDIA_ROOT = MEDIA_ROOT / "public" TENANT_MEDIA_ROOT = MEDIA_ROOT / "public"

12
module.nix
View file

@ -29,6 +29,7 @@ let
inherit (lib.strings) inherit (lib.strings)
concatStringsSep concatStringsSep
optionalString
versionOlder; versionOlder;
inherit (lib.trivial) inherit (lib.trivial)
@ -177,7 +178,12 @@ in
host = mkDefault ""; host = mkDefault "";
}; };
cert_discovery_dir = mkIf (cfg.nginx.enable && cfg.nginx.enableACME) "env://CREDENTIALS_DIRECTORY"; cert_discovery_dir = mkIf (cfg.nginx.enable && cfg.nginx.enableACME) "env://CREDENTIALS_DIRECTORY";
paths.media = mkDefault "/var/lib/authentik/media"; storage.media = {
backend = mkDefault "file";
file = mkDefault {
path = "/var/lib/authentik/media";
};
};
media.enable_upload = mkDefault true; media.enable_upload = mkDefault true;
}; };
redis.servers.authentik = { redis.servers.authentik = {
@ -258,7 +264,9 @@ in
restartTriggers = [ config.environment.etc."authentik/config.yml".source ]; restartTriggers = [ config.environment.etc."authentik/config.yml".source ];
preStart = '' preStart = ''
ln -svf ${cfg.authentikComponents.staticWorkdirDeps}/* /var/lib/authentik/ ln -svf ${cfg.authentikComponents.staticWorkdirDeps}/* /var/lib/authentik/
mkdir -p ${cfg.settings.paths.media} ${optionalString (cfg.settings.storage.media.backend == "file") ''
mkdir -p ${cfg.settings.storage.media.file.path}
''}
''; '';
environment.TZ = tz; environment.TZ = tz;
serviceConfig = mkMerge [ serviceDefaults { serviceConfig = mkMerge [ serviceDefaults {