roundcube:auth: fix OAuth client secret generation and copy order

This commit is contained in:
Alexander Tomokhov
2025-03-29 01:34:26 +04:00
parent f3593156dc
commit c118802155
2 changed files with 3 additions and 3 deletions

View File

@@ -109,10 +109,10 @@ in
''; '';
systemd.services.roundcube = { systemd.services.roundcube = {
after = [ auth-passthru.oauth2-systemd-service ]; after = [ auth-passthru.oauth2-systemd-service ];
requires = [ auth-passthru.oauth2-systemd-service ]; requires = [ auth-passthru.oauth2-systemd-service "dovecot2.service" ];
}; };
systemd.services.kanidm = { systemd.services.kanidm = {
serviceConfig.ExecStartPre = lib.mkBefore [ serviceConfig.ExecStartPre = lib.mkAfter [
("-+" + kanidmExecStartPreScriptRoot) ("-+" + kanidmExecStartPreScriptRoot)
]; ];
}; };

View File

@@ -137,7 +137,7 @@ in
serviceConfig.RuntimeDirectory = lib.mkForce [ runtime-directory ]; serviceConfig.RuntimeDirectory = lib.mkForce [ runtime-directory ];
}; };
systemd.services.kanidm.serviceConfig.ExecStartPre = lib.mkAfter [ systemd.services.kanidm.serviceConfig.ExecStartPre = lib.mkBefore [
("-" + oauth-secret-ExecStartPreScript) ("-" + oauth-secret-ExecStartPreScript)
]; ];
# does it merge with existing restartTriggers? # does it merge with existing restartTriggers?