From 112bd3300fcf7af72ae0f47847e9c7863db75178 Mon Sep 17 00:00:00 2001
From: Flancian <0@flancia.org>
Date: Sun, 28 May 2023 15:17:29 +0200
Subject: [PATCH] Disable parsoid, it's no longer needed.

This applies changes from https://git.coopcloud.tech/coop-cloud/mediawiki/pulls/32 independently; I believe the result should be a clean merge.
---
 LocalSettings.php.tmpl | 17 -----------------
 abra.sh                |  2 +-
 compose.yml            |  8 --------
 3 files changed, 1 insertion(+), 26 deletions(-)

diff --git a/LocalSettings.php.tmpl b/LocalSettings.php.tmpl
index 72e92c0..49e384b 100644
--- a/LocalSettings.php.tmpl
+++ b/LocalSettings.php.tmpl
@@ -150,23 +150,6 @@ $wgDefaultUserOptions['visualeditor-enable'] = 1;
 
 $wgVisualEditorAllowLossySwitching = false;
 
-$wgVirtualRestConfig['modules']['parsoid'] = [
-	// URL to the Parsoid instance - use port 8142 if you use the Debian package - the parameter 'URL' was first used but is now deprecated (string)
-	'url' => 'http://parsoid:8000/',
-	// Parsoid "domain" (string, optional) - MediaWiki >= 1.26
-	'domain' => 'localhost',
-	// Parsoid "prefix" (string, optional) - deprecated since MediaWiki 1.26, use 'domain'
-	'prefix' => 'localhost',
-	// Forward cookies in the case of private wikis (string or false, optional)
-	'forwardCookies' => true,
-	// request timeout in seconds (integer or null, optional)
-	'timeout' => null,
-	// Parsoid HTTP proxy (string or null, optional)
-	'HTTPProxy' => null,
-	// whether to parse URL as if they were meant for RESTBase (boolean or null, optional)
-	'restbaseCompat' => null,
-];
-
 {{ if eq (env "SAML_ENABLED") "1" }}
 wfLoadExtension( 'PluggableAuth' );
 
diff --git a/abra.sh b/abra.sh
index ffbea2c..27558ac 100644
--- a/abra.sh
+++ b/abra.sh
@@ -1,4 +1,4 @@
-export LOCAL_SETTINGS_CONF_VERSION=v16
+export LOCAL_SETTINGS_CONF_VERSION=v17
 export HTACCESS_CONF_VERSION=v1
 export ENTRYPOINT_CONF_VERSION=v15
 export COMPOSER_LOCAL_CONF_VERSION=v5
diff --git a/compose.yml b/compose.yml
index 18fd7c4..840b227 100644
--- a/compose.yml
+++ b/compose.yml
@@ -63,14 +63,6 @@ services:
     networks:
       - internal
 
-  parsoid:
-    image: thenets/parsoid:0.11.0
-    hostname: parsoidserver
-    networks:
-      - internal
-    environment:
-      PARSOID_DOMAIN_localhost: http://app:80/api.php
-
 volumes:
   mariadb:
   mediawiki_images: