From 87e2a53b5e4949f4b8ec78f4679a52a8cac3ee40 Mon Sep 17 00:00:00 2001
From: Tom Hughes <tom@compton.nu>
Date: Sun, 27 Apr 2025 09:47:20 +0100
Subject: [PATCH] Make mediawiki 1.43 the default for the wiki cookbook

---
 cookbooks/wiki/attributes/default.rb | 2 +-
 roles/muirdris.rb                    | 3 +--
 roles/wiki.rb                        | 3 ---
 3 files changed, 2 insertions(+), 6 deletions(-)

diff --git a/cookbooks/wiki/attributes/default.rb b/cookbooks/wiki/attributes/default.rb
index b25f9e481..49cd915c4 100644
--- a/cookbooks/wiki/attributes/default.rb
+++ b/cookbooks/wiki/attributes/default.rb
@@ -5,4 +5,4 @@ default[:wiki][:site_aliases] = [
 ]
 default[:wiki][:site_notice] = nil
 default[:wiki][:site_readonly] = nil
-default[:wiki][:mediawiki_version] = "1.39"
+default[:wiki][:mediawiki_version] = "1.43"
diff --git a/roles/muirdris.rb b/roles/muirdris.rb
index 1adfbdc93..2f1b50e06 100644
--- a/roles/muirdris.rb
+++ b/roles/muirdris.rb
@@ -33,8 +33,7 @@ default_attributes(
   :wiki => {
     :site_name => "test.wiki.openstreetmap.org",
     :site_aliases => [],
-    :site_notice => "TEST INSTANCE: Use wiki.openstreetmap.org for real work",
-    :mediawiki_version => "1.43"
+    :site_notice => "TEST INSTANCE: Use wiki.openstreetmap.org for real work"
   }
 )
 
diff --git a/roles/wiki.rb b/roles/wiki.rb
index a1b579a69..c6cb02000 100644
--- a/roles/wiki.rb
+++ b/roles/wiki.rb
@@ -64,9 +64,6 @@ default_attributes(
         :tmp_table_size => "128M"
       }
     }
-  },
-  :wiki => {
-    :mediawiki_version => "1.43"
   }
 )
 
-- 
2.39.5