hosting/selfhostblocks
1
0
Fork 0
Code Issues Activity

fix dependency order between keycloak and haproxy

Browse source
This commit is contained in:
ibizaman 2023-02-19 13:39:31 -08:00
parent 957eefe97e
commit 6d0cceac34
2 changed files with 5 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
oauth2-proxy/unit.nix
View file

@ -18,6 +18,7 @@
, distribution
, KeycloakService
, KeycloakCliService
, HaproxyService
, debug ? true
}:
@ -31,6 +32,7 @@ rec {
pkg =
{ KeycloakService
, KeycloakCliService
, HaproxyService
}:
let
formatted_allowed_roles = builtins.toJSON (concatStringsSep ", " allowed_roles);
@ -149,7 +151,7 @@ rec {
};
dependsOn = {
inherit KeycloakService KeycloakCliService;
inherit HaproxyService KeycloakService KeycloakCliService;
};
type = "systemd-unit";
}

3
vaultwarden/default.nix
View file

@ -26,6 +26,7 @@
, distribution ? {}
, KeycloakService ? null
, KeycloakCliService ? null
, HaproxyService ? null
}:
let
mkVaultwardenWeb = pkgs.callPackage ./web.nix {inherit utils;};
@ -194,7 +195,7 @@ rec {
clientSecret = "${serviceName}_oauth2proxy_clientsecret";
};
inherit distribution KeycloakService KeycloakCliService;
inherit distribution HaproxyService KeycloakService KeycloakCliService;
};
keycloakCliConfig = {