danvics/selfhostblocks
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 1

fix sso setup for nextcloud

Browse source 
We need to switch to a systemd service running before nextcloud-setup
because the secret file is now loaded with LoadCredential, which
means it must exist before the systemd service starts
This commit is contained in:
ibizaman 2025-06-24 18:52:03 +02:00 committed by Pierre Penninckx
parent a37c539e02
commit 56e837aaa0
1 changed files with 15 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
modules/services/nextcloud-server.nix
View file

@ -1076,15 +1076,21 @@ in
${occ} app:enable oidc_login ${occ} app:enable oidc_login
''; '';
systemd.services.nextcloud-setup.preStart = systemd.services.nextcloud-setup-pre = {
'' wantedBy = [ "multi-user.target" ];
mkdir -p ${cfg.dataDir}/config before = [ "nextcloud-setup.service" ];
cat <<EOF > "${cfg.dataDir}/config/secretFile" serviceConfig.Type = "oneshot";
{ serviceConfig.User = "nextcloud";
"oidc_login_client_secret": "$(cat ${cfg.apps.sso.secret.result.path})" script =
} ''
EOF mkdir -p ${cfg.dataDir}/config
''; cat <<EOF > "${cfg.dataDir}/config/secretFile"
{
"oidc_login_client_secret": "$(cat ${cfg.apps.sso.secret.result.path})"
}
EOF
'';
};
services.nextcloud = { services.nextcloud = {
secretFile = "${cfg.dataDir}/config/secretFile"; secretFile = "${cfg.dataDir}/config/secretFile";