fixup startup race

This commit is contained in:
Henry Hiles 2026-11-19 11:32:43 -05:00
commit 13b7f4b67e
Signed by: Henry-Hiles
SSH key fingerprint: SHA256:VKQUdS31Q90KvX7EkKMHMBpUspcmItAh86a+v7PGiIs
2 changed files with 15 additions and 7 deletions

View file

@ -20,7 +20,7 @@
displayName = "Search"; displayName = "Search";
originUrl = "https://${domain}/oauth2/callback"; originUrl = "https://${domain}/oauth2/callback";
originLanding = "https://${domain}"; 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}"; basicSecretFile = "/var/lib/kanidm-oauth2-secrets/${client}";
preferShortUsername = true; preferShortUsername = true;
scopeMaps.idm_all_persons = [ scopeMaps.idm_all_persons = [
@ -74,10 +74,14 @@
}; };
systemd.services = { systemd.services = {
caddy.serviceConfig.SupplementaryGroups = [ caddy = {
"degoog" wants = [ "degoog.service" ];
"oauth2-proxy" after = [ "degoog.service" ];
]; serviceConfig.SupplementaryGroups = [
"degoog"
"oauth2-proxy"
];
};
oauth2-proxy = { oauth2-proxy = {
requires = [ "kanidm.service" ]; requires = [ "kanidm.service" ];

View file

@ -339,6 +339,8 @@ in
serviceConfig = hardening // { serviceConfig = hardening // {
Type = "oneshot"; Type = "oneshot";
RemainAfterExit = true; RemainAfterExit = true;
Restart = "on-failure";
RestartSec = 5;
User = "kanidm"; User = "kanidm";
Group = "kanidm"; Group = "kanidm";
StateDirectory = "kanidm-bootstrap"; StateDirectory = "kanidm-bootstrap";
@ -397,8 +399,10 @@ in
kanidm-mail-sender = { kanidm-mail-sender = {
description = "Kanidm mail sender"; description = "Kanidm mail sender";
wantedBy = [ "multi-user.target" ]; wantedBy = [ "multi-user.target" ];
wants = [ "network-online.target" ]; wants = [
requires = [ "kanidm-bootstrap.service" ]; "network-online.target"
"kanidm-bootstrap.service"
];
after = [ after = [
"network-online.target" "network-online.target"
"kanidm-bootstrap.service" "kanidm-bootstrap.service"