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

fix nextcloud when sp.modules.auth.enable is true

Browse Source
This commit is contained in:
Alexander Tomokhov
2025-01-29 13:21:36 +04:00
parent 2cc5743152
commit 857d6729ef
2 changed files with 7 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
sp-modules/nextcloud/config-paths-needed.json
View File

@@ -1,6 +1,12 @@
[ [
[ "passthru", "selfprivacy", "auth", "admins-group" ], [ "passthru", "selfprivacy", "auth", "admins-group" ],
[ "passthru", "selfprivacy", "auth", "full-users-group" ], [ "passthru", "selfprivacy", "auth", "full-users-group" ],
[ "passthru", "selfprivacy", "auth", "ldap-base-dn" ],
[ "passthru", "selfprivacy", "auth", "ldap-host" ],
[ "passthru", "selfprivacy", "auth", "ldap-port" ],
[ "passthru", "selfprivacy", "auth", "oauth2-discovery-url" ],
[ "passthru", "selfprivacy", "auth", "oauth2-provider-name" ],
[ "passthru", "selfprivacy", "auth", "oauth2-systemd-service" ],
[ "security", "acme", "certs" ], [ "security", "acme", "certs" ],
[ "selfprivacy", "domain" ], [ "selfprivacy", "domain" ],
[ "selfprivacy", "modules", "auth", "enable" ], [ "selfprivacy", "modules", "auth", "enable" ],

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

@@ -11,7 +11,7 @@ let
hostName = "${cfg.subdomain}.${sp.domain}"; hostName = "${cfg.subdomain}.${sp.domain}";
auth-passthru = config.passthru.selfprivacy.auth; auth-passthru = config.passthru.selfprivacy.auth;
is-auth-enabled = sp.modules.nextcloud.enableSso; is-auth-enabled = sp.modules.auth.enable or false;
cfg = sp.modules.nextcloud; cfg = sp.modules.nextcloud;
ldap_scheme_and_host = "ldaps://${auth-passthru.ldap-host}"; ldap_scheme_and_host = "ldaps://${auth-passthru.ldap-host}";