Skip to content

Commit 3082a94

Browse files
authored
Merge pull request #50 from GeoffreyFrogeye/push-pollrpxtlxts
Split gopkgs
2 parents 3cf7092 + 960bc77 commit 3082a94

File tree

2 files changed

+14
-3
lines changed

2 files changed

+14
-3
lines changed

components/gopkgs.nix

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,12 @@ buildGo124Module {
3636
))
3737
);
3838
};
39+
outputs = [
40+
"out"
41+
"ldap"
42+
"proxy"
43+
"radius"
44+
];
3945
subPackages = [
4046
"cmd/ldap"
4147
"cmd/server"
@@ -48,5 +54,10 @@ buildGo124Module {
4854
postInstall = ''
4955
wrapProgram $out/bin/server --prefix PATH : ${authentikComponents.pythonEnv}/bin
5056
wrapProgram $out/bin/server --prefix PYTHONPATH : ${authentikComponents.staticWorkdirDeps}
57+
58+
mkdir -p $ldap/bin $proxy/bin $radius/bin
59+
mv $out/bin/ldap $ldap/bin/
60+
mv $out/bin/proxy $proxy/bin/
61+
mv $out/bin/radius $radius/bin/
5162
'';
5263
}

module.nix

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -458,7 +458,7 @@ in
458458
UMask = "0027";
459459
WorkingDirectory = "%t/authentik-ldap";
460460
DynamicUser = true;
461-
ExecStart = "${config.services.authentik.authentikComponents.gopkgs}/bin/ldap";
461+
ExecStart = "${config.services.authentik.authentikComponents.gopkgs.ldap}/bin/ldap";
462462
EnvironmentFile = mkIf (cfg.environmentFile != null) [ cfg.environmentFile ];
463463
Restart = "on-failure";
464464
};
@@ -489,7 +489,7 @@ in
489489
UMask = "0027";
490490
WorkingDirectory = "%t/authentik-proxy";
491491
DynamicUser = true;
492-
ExecStart = "${config.services.authentik.authentikComponents.gopkgs}/bin/proxy";
492+
ExecStart = "${config.services.authentik.authentikComponents.gopkgs.proxy}/bin/proxy";
493493
EnvironmentFile = mkIf (cfg.environmentFile != null) [ cfg.environmentFile ];
494494
Restart = "on-failure";
495495
};
@@ -516,7 +516,7 @@ in
516516
UMask = "0027";
517517
WorkingDirectory = "%t/authentik-radius";
518518
DynamicUser = true;
519-
ExecStart = "${config.services.authentik.authentikComponents.gopkgs}/bin/radius";
519+
ExecStart = "${config.services.authentik.authentikComponents.gopkgs.radius}/bin/radius";
520520
EnvironmentFile = mkIf (cfg.environmentFile != null) [ cfg.environmentFile ];
521521
Restart = "on-failure";
522522
};

0 commit comments

Comments
 (0)