From 543f9540bd5c6da3b0513884475af2054c4dcf52 Mon Sep 17 00:00:00 2001 From: ibizaman Date: Mon, 17 Mar 2025 01:10:01 +0100 Subject: [PATCH] add assertion to avoid issue with sso without ssl --- demo/nextcloud/flake.nix | 2 ++ modules/services/nextcloud-server.nix | 6 +++++- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/demo/nextcloud/flake.nix b/demo/nextcloud/flake.nix index 6382bca..d397cdd 100644 --- a/demo/nextcloud/flake.nix +++ b/demo/nextcloud/flake.nix @@ -92,6 +92,8 @@ }; }; }; + shb.nextcloud.ssl = config.shb.certs.certs.selfsigned.n; + shb.ldap.ssl = config.shb.certs.certs.selfsigned.n; services.dnsmasq = { enable = true; diff --git a/modules/services/nextcloud-server.nix b/modules/services/nextcloud-server.nix index fee6407..a716c88 100644 --- a/modules/services/nextcloud-server.nix +++ b/modules/services/nextcloud-server.nix @@ -1061,9 +1061,13 @@ in in lib.mkIf (cfg.enable && cfg.apps.sso.enable) { assertions = [ { - assertion = cfg.apps.sso.enable -> cfg.apps.ldap.enable; + assertion = cfg.apps.ldap.enable; message = "SSO app requires LDAP app to work correctly."; } + { + assertion = cfg.ssl != null; + message = "To integrate SSO, SSL must be enabled, set the shb.nextcloud.ssl option."; + } ]; systemd.services.nextcloud-setup.script =