chore: publish 2.2.2+1.39.1 release

Merge pull request 'Update LocalSettings.php.tmpl to match new configuration syntax.' (#29 ) from flancian/wiki.social.coop:main into main
Reviewed-on: coop-cloud/mediawiki#29
2023-03-28 11:08:31 -04:00 · 2023-03-28 14:36:47 +00:00 · 2023-03-28 12:13:12 +02:00
3 changed files with 9 additions and 5 deletions
--- 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;
--- 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
--- a/compose.yml
+++ b/compose.yml
@ -45,7 +45,7 @@ services:
        - "traefik.http.routers.${STACK_NAME}.rule=Host(`${DOMAIN}`${EXTRA_DOMAINS})"
        - "traefik.http.routers.${STACK_NAME}.tls.certresolver=${LETS_ENCRYPT_ENV}"
        - "traefik.http.routers.${STACK_NAME}.entrypoints=web-secure"
-        - "coop-cloud.${STACK_NAME}.version=2.2.1+1.39.1"
+        - "coop-cloud.${STACK_NAME}.version=2.2.2+1.39.1"
    entrypoint: /docker-entrypoint2.sh

  db:
Author	SHA1	Message	Date
3wc	9ee106a2ed	chore: publish 2.2.2+1.39.1 release	2023-03-28 11:08:31 -04:00
3wordchant	bce93ab727	Merge pull request 'Update LocalSettings.php.tmpl to match new configuration syntax.' (#29 ) from flancian/wiki.social.coop:main into main Reviewed-on: coop-cloud/mediawiki#29	2023-03-28 14:36:47 +00:00
Flancian	8c503d5d28	Update LocalSettings.php.tmpl to match new configuration syntax. This syntax follows that at https://www.mediawiki.org/wiki/Extension:OpenID_Connect.	2023-03-28 12:13:12 +02:00