From f05d45ee5264466c0e9ccb3b6f6258bd857af7e9 Mon Sep 17 00:00:00 2001
From: 3wc <3wc.git@doesthisthing.work>
Date: Sat, 24 Oct 2020 03:56:51 +0200
Subject: [PATCH] Switch to official Mediawiki image + update to 1.35

Closes #4, #8
---
 LocalSettings.php.tmpl |  2 +-
 compose.yml            | 13 +++++++++----
 entrypoint.sh.tmpl     |  2 +-
 3 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/LocalSettings.php.tmpl b/LocalSettings.php.tmpl
index 1bfe8ec..f55d0b6 100644
--- a/LocalSettings.php.tmpl
+++ b/LocalSettings.php.tmpl
@@ -151,7 +151,7 @@ $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://localhost:8000/',
+	'url' => 'http://parsoid:8000/',
 	// Parsoid "domain" (string, optional) - MediaWiki >= 1.26
 	'domain' => 'localhost',
 	// Parsoid "prefix" (string, optional) - deprecated since MediaWiki 1.26, use 'domain'
diff --git a/compose.yml b/compose.yml
index 8bd91da..37967f4 100644
--- a/compose.yml
+++ b/compose.yml
@@ -3,7 +3,7 @@ version: "3.8"
 
 services:
   app:
-    image: "revianlabs/mediawiki-ve-bundle"
+    image: mediawiki:1.35.0
     environment:
       - DOMAIN
       - STACK_NAME
@@ -46,9 +46,6 @@ 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"
-        - "traefik.http.routers.${STACK_NAME}.middlewares=${STACK_NAME}-redirect"
-        - "traefik.http.middlewares.${STACK_NAME}-redirect.headers.SSLForceHost=true"
-        - "traefik.http.middlewares.${STACK_NAME}-redirect.headers.SSLHost=${DOMAIN}"
     entrypoint: /docker-entrypoint2.sh
 
   db:
@@ -72,6 +69,14 @@ services:
         max_attempts: 3
         window: 120s
 
+  parsoid:
+    image: thenets/parsoid:0.9.0
+    hostname: parsoidserver
+    networks:
+      - internal
+    environment:
+      PARSOID_DOMAIN_localhost: http://app:80/api.php
+
 volumes:
   mariadb:
   mediawiki_images:
diff --git a/entrypoint.sh.tmpl b/entrypoint.sh.tmpl
index 02ba64d..e0dd407 100755
--- a/entrypoint.sh.tmpl
+++ b/entrypoint.sh.tmpl
@@ -87,4 +87,4 @@ main() {
 
 main
 
-/docker-entrypoint.sh apache2-foreground "$@"
+apache2-foreground