From c1a2a58c31775fd94ac24b5703cf72ac39a302c4 Mon Sep 17 00:00:00 2001
From: Maarten de Waard <maarten@greenhost.nl>
Date: Tue, 2 Nov 2021 16:14:47 +0100
Subject: [PATCH 1/2] try to set sociallogin settings correctly
---
flux2/apps/nextcloud/nextcloud-values-configmap.yaml | 12 ++++++++----
flux2/infrastructure/sources/nextcloud.yaml | 2 +-
2 files changed, 9 insertions(+), 5 deletions(-)
diff --git a/flux2/apps/nextcloud/nextcloud-values-configmap.yaml b/flux2/apps/nextcloud/nextcloud-values-configmap.yaml
index 4d865b032..6adb448ed 100644
--- a/flux2/apps/nextcloud/nextcloud-values-configmap.yaml
+++ b/flux2/apps/nextcloud/nextcloud-values-configmap.yaml
@@ -198,7 +198,11 @@ data:
save ""
sociallogin:
- server_name: "sso.${domain}"
- client_id: nextcloud
- client_secret: "${nextcloud_oauth_client_secret}"
- wordpressgroups_claim: "openappstack_roles"
+ custom_oidc:
+ authorizeUrl: "sso.${domain}/oauth2/auth"
+ tokenUrl: "sso.${domain}/oauth2/token"
+ userInfoUrl: "sso.${domain}/userinfo"
+ clientSecret: "${nextcloud_oauth_client_secret}"
+ groupsClaim: "openappstack_roles"
+ clientId: nextcloud
+ title: OpenAppStack
diff --git a/flux2/infrastructure/sources/nextcloud.yaml b/flux2/infrastructure/sources/nextcloud.yaml
index 181face9e..f966eca79 100644
--- a/flux2/infrastructure/sources/nextcloud.yaml
+++ b/flux2/infrastructure/sources/nextcloud.yaml
@@ -14,4 +14,4 @@ spec:
# For all available options, see:
# https://toolkit.fluxcd.io/components/source/api/#source.toolkit.fluxcd.io/v1beta1.GitRepositoryRef
ref:
- tag: 0.4.0
+ branch: 994-allow-oidc-to-support-stackspin-sso-again
--
GitLab
From 61d20b2a5b768cc8ab6fd8d8686f0b036a2a5f23 Mon Sep 17 00:00:00 2001
From: Maarten de Waard <maarten@greenhost.nl>
Date: Wed, 3 Nov 2021 10:24:38 +0100
Subject: [PATCH 2/2] use nextcloud 0.5.0 tag
---
flux2/infrastructure/sources/nextcloud.yaml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/flux2/infrastructure/sources/nextcloud.yaml b/flux2/infrastructure/sources/nextcloud.yaml
index f966eca79..ae563b31a 100644
--- a/flux2/infrastructure/sources/nextcloud.yaml
+++ b/flux2/infrastructure/sources/nextcloud.yaml
@@ -14,4 +14,4 @@ spec:
# For all available options, see:
# https://toolkit.fluxcd.io/components/source/api/#source.toolkit.fluxcd.io/v1beta1.GitRepositoryRef
ref:
- branch: 994-allow-oidc-to-support-stackspin-sso-again
+ tag: 0.5.0
--
GitLab