From 6d0cceac34aaf03683b1962b3dbb6ba717d61117 Mon Sep 17 00:00:00 2001
From: ibizaman <ibizapeanut@gmail.com>
Date: Sun, 19 Feb 2023 13:39:31 -0800
Subject: [PATCH] fix dependency order between keycloak and haproxy

---
 oauth2-proxy/unit.nix   | 4 +++-
 vaultwarden/default.nix | 3 ++-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/oauth2-proxy/unit.nix b/oauth2-proxy/unit.nix
index 70fd654..7547ade 100644
--- a/oauth2-proxy/unit.nix
+++ b/oauth2-proxy/unit.nix
@@ -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";
 }
diff --git a/vaultwarden/default.nix b/vaultwarden/default.nix
index 94831f1..e4feb3b 100644
--- a/vaultwarden/default.nix
+++ b/vaultwarden/default.nix
@@ -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 = {