fixup startup race
This commit is contained in:
parent
569518fa7c
commit
13b7f4b67e
2 changed files with 15 additions and 7 deletions
|
|
@ -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" ];
|
||||||
|
|
|
||||||
|
|
@ -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"
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue