thary/sp-config
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

gitea,nextcloud,roundcube,mailserver: depend on kanidm systemd service

Browse Source
This commit is contained in:
Alexander Tomokhov
2025-02-03 01:04:19 +04:00
parent ee2e404eb8
commit ea443d2150
4 changed files with 7 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
sp-modules/gitea/module.nix
View File

@@ -399,6 +399,7 @@ in
fi fi
''; '';
# TODO consider passing oauth consumer service to auth module instead # TODO consider passing oauth consumer service to auth module instead
after = [ auth-passthru.oauth2-systemd-service ];
requires = [ auth-passthru.oauth2-systemd-service ]; requires = [ auth-passthru.oauth2-systemd-service ];
}; };

1
sp-modules/nextcloud/module.nix
View File

@@ -378,6 +378,7 @@ in
-vvv -vvv
''; '';
# TODO consider passing oauth consumer service to auth module instead # TODO consider passing oauth consumer service to auth module instead
after = [ auth-passthru.oauth2-systemd-service ];
requires = [ auth-passthru.oauth2-systemd-service ]; requires = [ auth-passthru.oauth2-systemd-service ];
}; };
services.kanidm.provision = { services.kanidm.provision = {

4
sp-modules/roundcube/module.nix
View File

@@ -103,6 +103,10 @@ in
$config['oauth_verify_peer'] = false; # FIXME $config['oauth_verify_peer'] = false; # FIXME
# $config['oauth_pkce'] = 'S256'; # FIXME # $config['oauth_pkce'] = 'S256'; # FIXME
''; '';
systemd.services.roundcube = {
after = [ auth-passthru.oauth2-systemd-service ];
requires = [ auth-passthru.oauth2-systemd-service ];
};
systemd.services.kanidm = { systemd.services.kanidm = {
serviceConfig.ExecStartPre = lib.mkBefore [ serviceConfig.ExecStartPre = lib.mkBefore [
("-+" + kanidmExecStartPreScriptRoot) ("-+" + kanidmExecStartPreScriptRoot)

2
sp-modules/simple-nixos-mailserver/auth-dovecot.nix
View File

@@ -132,8 +132,8 @@ in
# TODO does it merge with existing preStart? # TODO does it merge with existing preStart?
preStart = setPwdInLdapConfFile + "\n" + write-dovecot-oauth2-conf + "\n"; preStart = setPwdInLdapConfFile + "\n" + write-dovecot-oauth2-conf + "\n";
# FIXME pass dependant services to auth module option instead? # FIXME pass dependant services to auth module option instead?
wants = [ auth-passthru.oauth2-systemd-service ];
after = [ auth-passthru.oauth2-systemd-service ]; after = [ auth-passthru.oauth2-systemd-service ];
requires = [ auth-passthru.oauth2-systemd-service ];
serviceConfig.RuntimeDirectory = lib.mkForce [ runtime-directory ]; serviceConfig.RuntimeDirectory = lib.mkForce [ runtime-directory ];
}; };