From 8c503d5d2824116c812559ee39962db46833d429 Mon Sep 17 00:00:00 2001
From: Flancian <0@flancia.org>
Date: Tue, 28 Mar 2023 12:12:13 +0200
Subject: [PATCH] Update LocalSettings.php.tmpl to match new configuration
 syntax.

This syntax follows that at
https://www.mediawiki.org/wiki/Extension:OpenID_Connect.
---
 LocalSettings.php.tmpl | 10 +++++++---
 abra.sh                |  2 +-
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/LocalSettings.php.tmpl b/LocalSettings.php.tmpl
index 2a35a44..a5c35ba 100644
--- a/LocalSettings.php.tmpl
+++ b/LocalSettings.php.tmpl
@@ -191,9 +191,13 @@ $wgDebugToolbar = true;
 wfLoadExtension( 'PluggableAuth' );
 wfLoadExtension( 'OpenIDConnect' );
 
-$wgOpenIDConnect_Config['{{ env "OPENID_KEYCLOAK_URL" }}'] = [
-  'clientID' => '{{ env "OPENID_CLIENT_ID"}}',
-  'clientsecret' => '{{ secret "openid_client_secret" }}'
+$wgPluggableAuth_Config[] = [
+    'plugin' => 'OpenIDConnect',
+    'data' => [
+        'providerURL' => '{{ env "OPENID_KEYCLOAK_URL" }}',
+        'clientID' => '{{ env "OPENID_CLIENT_ID"}}',
+        'clientsecret' => '{{ secret "openid_client_secret" }}'
+    ]
 ];
 
 $wgGroupPermissions['*']['autocreateaccount'] = true;
diff --git a/abra.sh b/abra.sh
index 4052f80..2d9b513 100644
--- a/abra.sh
+++ b/abra.sh
@@ -1,4 +1,4 @@
-export LOCAL_SETTINGS_CONF_VERSION=v5
+export LOCAL_SETTINGS_CONF_VERSION=v6
 export HTACCESS_CONF_VERSION=v1
 export ENTRYPOINT_CONF_VERSION=v3
 export COMPOSER_LOCAL_CONF_VERSION=v1