diff --git a/clients/quadraticserver/degoog.nix b/clients/quadraticserver/degoog.nix index b7b9726..8223998 100644 --- a/clients/quadraticserver/degoog.nix +++ b/clients/quadraticserver/degoog.nix @@ -20,7 +20,7 @@ displayName = "Search"; originUrl = "https://${domain}/oauth2/callback"; originLanding = "https://${domain}"; - imageFile = "${config.services.degoog.package}/share/degoog/src/public/images/degoog-logo.svg"; + imageFile = "${config.services.degoog.package}/share/degoog/src/public/images/degoog-logo.svg"; basicSecretFile = "/var/lib/kanidm-oauth2-secrets/${client}"; preferShortUsername = true; scopeMaps.idm_all_persons = [ @@ -74,10 +74,14 @@ }; systemd.services = { - caddy.serviceConfig.SupplementaryGroups = [ - "degoog" - "oauth2-proxy" - ]; + caddy = { + wants = [ "degoog.service" ]; + after = [ "degoog.service" ]; + serviceConfig.SupplementaryGroups = [ + "degoog" + "oauth2-proxy" + ]; + }; oauth2-proxy = { requires = [ "kanidm.service" ]; diff --git a/clients/quadraticserver/kanidm/default.nix b/clients/quadraticserver/kanidm/default.nix index 18fb817..2418dbf 100644 --- a/clients/quadraticserver/kanidm/default.nix +++ b/clients/quadraticserver/kanidm/default.nix @@ -339,6 +339,8 @@ in serviceConfig = hardening // { Type = "oneshot"; RemainAfterExit = true; + Restart = "on-failure"; + RestartSec = 5; User = "kanidm"; Group = "kanidm"; StateDirectory = "kanidm-bootstrap"; @@ -397,8 +399,10 @@ in kanidm-mail-sender = { description = "Kanidm mail sender"; wantedBy = [ "multi-user.target" ]; - wants = [ "network-online.target" ]; - requires = [ "kanidm-bootstrap.service" ]; + wants = [ + "network-online.target" + "kanidm-bootstrap.service" + ]; after = [ "network-online.target" "kanidm-bootstrap.service"