hosting/selfhostblocks
1
0
Fork 0
Code Issues Activity

apply nextcloud test fix to all configs

Browse source
This commit is contained in:
ibizaman 2024-09-02 07:13:40 +02:00 committed by Pierre Penninckx
parent 35bfb01848
commit 1bd5810a6d
1 changed files with 6 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -729,7 +729,7 @@ in
systemd.services.nextcloud-setup.after = cfg.mountPointServices; systemd.services.nextcloud-setup.after = cfg.mountPointServices;
}) })
(lib.mkIf cfg.apps.onlyoffice.enable { (lib.mkIf (cfg.enable && cfg.apps.onlyoffice.enable) {
assertions = [ assertions = [
{ {
assertion = !(isNull cfg.apps.onlyoffice.jwtSecretFile); assertion = !(isNull cfg.apps.onlyoffice.jwtSecretFile);
@ -764,7 +764,7 @@ in
}; };
}) })
(lib.mkIf cfg.apps.previewgenerator.enable { (lib.mkIf (cfg.enable && cfg.apps.previewgenerator.enable) {
services.nextcloud.extraApps = { services.nextcloud.extraApps = {
inherit ((nextcloudApps cfg.version)) previewgenerator; inherit ((nextcloudApps cfg.version)) previewgenerator;
}; };
@ -803,7 +803,7 @@ in
}; };
}) })
(lib.mkIf cfg.apps.externalStorage.enable { (lib.mkIf (cfg.enable && cfg.apps.externalStorage.enable) {
systemd.services.nextcloud-setup.script = '' systemd.services.nextcloud-setup.script = ''
${occ} app:install files_external || : ${occ} app:install files_external || :
${occ} app:enable files_external ${occ} app:enable files_external
@ -825,7 +825,7 @@ in
''); '');
}) })
(lib.mkIf cfg.apps.ldap.enable { (lib.mkIf (cfg.enable && cfg.apps.ldap.enable) {
systemd.services.nextcloud-setup.path = [ pkgs.jq ]; systemd.services.nextcloud-setup.path = [ pkgs.jq ];
systemd.services.nextcloud-setup.script = systemd.services.nextcloud-setup.script =
let let
@ -905,7 +905,7 @@ in
"email" "email"
"groups" "groups"
]; ];
in lib.mkIf cfg.apps.sso.enable { in lib.mkIf (cfg.enable && cfg.apps.sso.enable) {
assertions = [ assertions = [
{ {
assertion = cfg.apps.sso.enable -> cfg.apps.ldap.enable; assertion = cfg.apps.sso.enable -> cfg.apps.ldap.enable;
@ -998,6 +998,7 @@ in
} }
]; ];
}) })
(lib.mkIf (cfg.enable && cfg.autoDisableMaintenanceModeOnStart) { (lib.mkIf (cfg.enable && cfg.autoDisableMaintenanceModeOnStart) {
systemd.services.nextcloud-setup.preStart = systemd.services.nextcloud-setup.preStart =
lib.mkBefore '' lib.mkBefore ''