Merge pull request #25 from Ma27/media-root-cfg-fix

module: fix media root config
This commit is contained in:
WilliButz 2024-06-07 13:19:13 +02:00 committed by GitHub
commit 1942bdac27
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 11 additions and 3 deletions

View file

@ -9,7 +9,7 @@ index 40795d460..7ac1efb34 100644
+from authentik.lib.config import CONFIG
-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"

View file

@ -29,6 +29,7 @@ let
inherit (lib.strings)
concatStringsSep
optionalString
versionOlder;
inherit (lib.trivial)
@ -177,7 +178,12 @@ in
host = mkDefault "";
};
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;
};
redis.servers.authentik = {
@ -258,7 +264,9 @@ in
restartTriggers = [ config.environment.etc."authentik/config.yml".source ];
preStart = ''
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;
serviceConfig = mkMerge [ serviceDefaults {