Merge pull request #7 from allthingslinux/44-upgrade

Mediawiki 1.44.0 upgrade

Author: Atmois

Dockerfile ContainerfileDockerfile renamed to Containerfile

@@ -52,10 +52,10 @@ FROM php:8.3-fpm-alpine AS mediawiki
 SHELL ["/bin/ash", "-eo", "pipefail", "-c"]
 
 # Build Arguments
-ARG MEDIAWIKI_MAJOR_VERSION=1.43
-ARG MEDIAWIKI_VERSION=1.43.3
-ARG CITIZEN_VERSION=3.5.0
-ARG MEDIAWIKI_BRANCH=REL1_43
+ARG MEDIAWIKI_MAJOR_VERSION
+ARG MEDIAWIKI_VERSION
+ARG CITIZEN_VERSION
+ARG MEDIAWIKI_BRANCH
 
 RUN --mount=type=cache,target=/var/cache/apk,sharing=locked \
     set -eux && \

Justfile

@@ -16,23 +16,23 @@ stop:
 update-prod:
     docker compose down -v
     sudo git pull
-    just copy-file production-compose.yml.example compose.yml
+    just copy-file production-compose.yaml.example compose.yaml
     docker compose up -d --build
 
 # Restart the staging wiki after an update (stops, pulls, rebuilds, starts)
 update-staging:
     docker compose down -v
     sudo git pull
-    just copy-file staging-compose.yml.example compose.yml
+    just copy-file staging-compose.yaml.example compose.yaml
     docker compose up -d --build
 
 # === Configuration Setup ===
 
 # Setup production environment (copies prod compose and env files, installs prod systemd)
-setup-prod: (copy-file "production-compose.yml.example" "compose.yml") env sitemap-prod
+setup-prod: (copy-file "production-compose.yaml.example" "compose.yaml") env sitemap-prod
 
 # Setup staging environment (copies staging compose and env files, installs staging systemd)
-setup-staging: (copy-file "staging-compose.yml.example" "compose.yml") env sitemap-staging
+setup-staging: (copy-file "staging-compose.yaml.example" "compose.yaml") env sitemap-staging
 
 # Copy environment example to .env
 env: (copy-file ".example.env" ".env")

configs/50-Extensions_Load.php

@@ -49,8 +49,6 @@
 wfLoadExtension('Echo');
 // https://www.mediawiki.org/wiki/Extension:Editcount
 wfLoadExtension('Editcount');
-// https://www.mediawiki.org/wiki/Extension:Favorites
-wfLoadExtension('Favorites');
 // https://www.mediawiki.org/wiki/Extension:FilterSpecialPages
 wfLoadExtension('FilterSpecialPages');
 // https://www.mediawiki.org/wiki/Extension:Gadgets
@@ -59,8 +57,6 @@
 wfLoadExtension('ImageMap');
 // https://www.mediawiki.org/wiki/Extension:InputBox
 wfLoadExtension('InputBox');
-// https://www.mediawiki.org/wiki/Extension:Interwiki
-wfLoadExtension('Interwiki');
 // https://www.mediawiki.org/wiki/Extension:LastModified
 wfLoadExtension('LastModified');
 // https://www.mediawiki.org/wiki/Extension:Linter
@@ -115,8 +111,6 @@
 wfLoadExtension('TextExtracts');
 // https://www.mediawiki.org/wiki/Extension:Thanks
 wfLoadExtension('Thanks');
-// https://www.mediawiki.org/wiki/Extension:TopLink
-wfLoadExtension('TopLink');
 // https://www.mediawiki.org/wiki/Extension:UserMerge
 wfLoadExtension('UserMerge');
 // https://www.mediawiki.org/wiki/Extension:VisualEditor

configs/51-Extensions_Config.php

@@ -42,6 +42,7 @@
 //######################################################// ConfirmEdit
 // https://www.mediawiki.org/wiki/Extension:ConfirmEdit
 
+$wgCaptchaClass = MediaWiki\Extension\ConfirmEdit\Turnstile\Turnstile::class;
 $wgTurnstileSiteKey= $_ENV['TURNSTILE_SITE_KEY'];
 $wgTurnstileSecretKey= $_ENV['TURNSTILE_SECRET_KEY'];
 

extensions.json

@@ -17,14 +17,6 @@
     "extension_url": "https://gerrit.wikimedia.org/r/mediawiki/extensions/Capiunto",
     "install_type": "git"
   },
-  {
-    "extension_name": "CheckUser",
-    "extension_url": "https://gerrit.wikimedia.org/r/mediawiki/extensions/CheckUser",
-    "install_type": "git",
-		"post_install_commands": [
-			"composer install --no-dev"
-		]
-  },
   {
     "extension_name": "CodeMirror",
     "extension_url": "https://gerrit.wikimedia.org/r/mediawiki/extensions/CodeMirror",
@@ -43,7 +35,7 @@
   },
   {
     "extension_name": "Discord",
-    "extension_url": "https://github.com/jayktaylor/mw-discord",
+    "extension_url": "https://github.com/allthingslinux/mw-discord-44",
     "install_type": "git",
     "git_branch": "master"
   },
@@ -57,16 +49,6 @@
     "extension_url": "https://gerrit.wikimedia.org/r/mediawiki/extensions/Editcount",
     "install_type": "git"
   },
-  {
-    "extension_name": "Favorites",
-    "extension_url": "https://gerrit.wikimedia.org/r/mediawiki/extensions/Favorites",
-    "install_type": "git"
-  },
-  {
-    "extension_name": "FilterSpecialPages",
-    "extension_url": "https://gerrit.wikimedia.org/r/mediawiki/extensions/FilterSpecialPages",
-    "install_type": "git"
-  },
   {
     "extension_name": "LastModified",
     "extension_url": "https://gerrit.wikimedia.org/r/mediawiki/extensions/LastModified",
@@ -105,12 +87,6 @@
     "extension_url": "https://gerrit.wikimedia.org/r/mediawiki/extensions/TemplateSandbox",
     "install_type": "git"
   },
-  {
-    "extension_name": "TopLink",
-    "extension_url": "https://github.com/mywikis/TopLink",
-    "install_type": "git",
-    "git_branch": "main"
-  },
   {
     "extension_name": "UserMerge",
     "extension_url": "https://gerrit.wikimedia.org/r/mediawiki/extensions/UserMerge",
@@ -124,24 +100,22 @@
 			"composer install --no-dev"
 		]
   },
-  {
-    "extension_name": "TemplateStyles",
-    "extension_url": "https://extdist.wmflabs.org/dist/extensions/TemplateStyles-REL1_43-adea53c.tar.gz",
-    "install_type": "tarball",
-		"post_install_commands": [
-			"composer install --no-dev"
-		]
-  },
   {
     "extension_name": "TemplateStylesExtender",
-    "extension_url": "https://github.com/octfx/mediawiki-extensions-TemplateStylesExtender/archive/refs/tags/v2.0.0.tar.gz",
+    "extension_url": "https://github.com/octfx/mediawiki-extensions-TemplateStylesExtender/archive/refs/tags/v2.1.0.tar.gz",
     "install_type": "tarball"
   },
   {
     "extension_name": "AWS",
     "extension_url": "https://github.com/edwardspec/mediawiki-aws-s3",
     "install_type": "git",
     "git_branch": "master"
+  },
+  {
+    "extension_name": "FilterSpecialPages",
+    "extension_url": "https://gerrit.wikimedia.org/r/mediawiki/extensions/FilterSpecialPages",
+    "install_type": "git",
+    "git_branch": "REL1_43"
   }
 ]
 

install_extensions.py

@@ -17,6 +17,12 @@
 EXTENSIONS_DIR = '/var/www/atlwiki/mediawiki/extensions'
 
 def run(command):
+    """
+    Run a shell command and handle errors
+
+    args:
+        command (str): The shell command to run
+    """
     print(f'Running: {command}')
     try:
         subprocess.check_call(command, shell=True)
@@ -25,7 +31,11 @@ def run(command):
         raise
 
 def main():
-    with open(EXTENSIONS_JSON) as extensions_file:
+    """
+    Install MediaWiki extensions as specified in the extensions.json file
+    """
+
+    with open(EXTENSIONS_JSON, encoding='utf-8') as extensions_file:
         extensions = json.load(extensions_file)
     os.makedirs(EXTENSIONS_DIR, exist_ok=True)
     os.chdir(EXTENSIONS_DIR)
@@ -37,7 +47,8 @@ def main():
         print(f"Installing {extension_name}...")
 
         if install_type == 'git':
-            run(f"git clone --branch {git_branch} --single-branch --depth 1 {extension_url} {extension_name}")
+            run(f"git clone \
+                --branch {git_branch} --single-branch --depth 1 {extension_url} {extension_name}")
         elif install_type == 'tarball':
             tarball_name = f"{extension_name}.tar.gz"
             run(f"curl -fsSL {extension_url} -o {tarball_name}")