roundcube:auth: fix OAuth client secret generation and copy order
This commit is contained in:
@@ -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)
|
||||||
];
|
];
|
||||||
};
|
};
|
||||||
|
@@ -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?
|
||||||
|
Reference in New Issue
Block a user