components: drop celery, package manage.py instead
This commit is contained in:
parent
8edfcf318a
commit
d85dacb6c2
5 changed files with 21 additions and 18 deletions
|
|
@ -1,13 +0,0 @@
|
|||
{ authentikComponents
|
||||
, makeWrapper
|
||||
, runCommandLocal
|
||||
}:
|
||||
|
||||
runCommandLocal "authentik-celery" {
|
||||
nativeBuildInputs = [ makeWrapper ];
|
||||
} ''
|
||||
mkdir -vp $out/bin
|
||||
ln -sv ${authentikComponents.pythonEnv}/bin/celery $out/bin/celery
|
||||
wrapProgram $out/bin/celery \
|
||||
--prefix PYTHONPATH : ${authentikComponents.staticWorkdirDeps}
|
||||
''
|
||||
|
|
@ -29,7 +29,7 @@ pkgs.lib.makeScope pkgs.newScope (final:
|
|||
inherit authentik-src;
|
||||
};
|
||||
# worker
|
||||
celery = final.callPackage ./celery.nix {
|
||||
manage = final.callPackage ./manage.nix {
|
||||
};
|
||||
in
|
||||
{
|
||||
|
|
@ -41,7 +41,7 @@ pkgs.lib.makeScope pkgs.newScope (final:
|
|||
gopkgs
|
||||
staticWorkdirDeps
|
||||
migrate
|
||||
celery;
|
||||
manage;
|
||||
};
|
||||
inherit authentik-src authentik-version;
|
||||
}
|
||||
|
|
|
|||
16
components/manage.nix
Normal file
16
components/manage.nix
Normal file
|
|
@ -0,0 +1,16 @@
|
|||
{ authentik-src
|
||||
, authentikComponents
|
||||
, makeWrapper
|
||||
, runCommandLocal
|
||||
}:
|
||||
|
||||
runCommandLocal "authentik-manage" {
|
||||
nativeBuildInputs = [ makeWrapper ];
|
||||
} ''
|
||||
mkdir -vp $out/bin
|
||||
cp -v ${authentik-src}/manage.py $out/bin/manage.py
|
||||
|
||||
wrapProgram $out/bin/manage.py \
|
||||
--prefix PATH : ${authentikComponents.pythonEnv}/bin \
|
||||
--prefix PYTHONPATH : ${authentikComponents.staticWorkdirDeps}
|
||||
''
|
||||
|
|
@ -58,7 +58,7 @@
|
|||
imports = [ ./module.nix ];
|
||||
services.authentik.authentikComponents = pkgs.lib.mkDefault (withSystem pkgs.stdenv.hostPlatform.system (
|
||||
{ config, ... }:
|
||||
{ inherit (config.packages) celery staticWorkdirDeps migrate pythonEnv frontend gopkgs docs; }
|
||||
{ inherit (config.packages) manage staticWorkdirDeps migrate pythonEnv frontend gopkgs docs; }
|
||||
));
|
||||
};
|
||||
|
||||
|
|
@ -92,7 +92,7 @@
|
|||
gopkgs
|
||||
staticWorkdirDeps
|
||||
migrate
|
||||
celery;
|
||||
manage;
|
||||
|
||||
# terraform provider
|
||||
terraform-provider-authentik = inputs.nixpkgs-23-05.legacyPackages.${system}.buildGo118Module rec {
|
||||
|
|
|
|||
|
|
@ -165,7 +165,7 @@ in
|
|||
DynamicUser = true;
|
||||
User = "authentik";
|
||||
# TODO maybe make this configurable
|
||||
ExecStart = "${cfg.authentikComponents.celery}/bin/celery -A authentik.root.celery worker -Ofair --max-tasks-per-child=1 --autoscale 3,1 -E -B -s /tmp/celerybeat-schedule -Q authentik,authentik_scheduled,authentik_events";
|
||||
ExecStart = "${cfg.authentikComponents.manage}/bin/manage.py worker";
|
||||
EnvironmentFile = mkIf (cfg.environmentFile != null) [ cfg.environmentFile ];
|
||||
LoadCredential = mkIf (cfg.nginx.enable && cfg.nginx.enableACME) [
|
||||
"${cfg.nginx.host}.pem:${config.security.acme.certs.${cfg.nginx.host}.directory}/fullchain.pem"
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue