From 176d46fe9b5deb4080f433b1ca7f7786492fda9a Mon Sep 17 00:00:00 2001
From: Tom Hughes <tom@compton.nu>
Date: Wed, 22 Nov 2017 18:13:01 +0000
Subject: [PATCH] Update wiki to mediawiki 1.29

---
 cookbooks/foundation/recipes/board.rb | 1 -
 cookbooks/foundation/recipes/dwg.rb   | 1 -
 cookbooks/foundation/recipes/wiki.rb  | 1 -
 cookbooks/mediawiki/resources/site.rb | 2 +-
 roles/wiki.rb                         | 2 +-
 5 files changed, 2 insertions(+), 5 deletions(-)

diff --git a/cookbooks/foundation/recipes/board.rb b/cookbooks/foundation/recipes/board.rb
index 0a4cca79f..390576f0c 100644
--- a/cookbooks/foundation/recipes/board.rb
+++ b/cookbooks/foundation/recipes/board.rb
@@ -37,7 +37,6 @@ mediawiki_site "board.osmfoundation.org" do
   private true
   recaptcha_public_key "6LflIQATAAAAAMXyDWpba-FgipVzE-aGF4HIR59N"
   recaptcha_private_key passwords["board"]["recaptcha"]
-  version "1.29"
 end
 
 cookbook_file "/srv/board.osmfoundation.org/Wiki.png" do
diff --git a/cookbooks/foundation/recipes/dwg.rb b/cookbooks/foundation/recipes/dwg.rb
index 47e6f3cf8..3fde37b17 100644
--- a/cookbooks/foundation/recipes/dwg.rb
+++ b/cookbooks/foundation/recipes/dwg.rb
@@ -37,7 +37,6 @@ mediawiki_site "dwg.osmfoundation.org" do
   private true
   recaptcha_public_key "6LflIQATAAAAAMXyDWpba-FgipVzE-aGF4HIR59N"
   recaptcha_private_key passwords["dwg"]["recaptcha"]
-  version "1.29"
 end
 
 cookbook_file "/srv/dwg.osmfoundation.org/Wiki.png" do
diff --git a/cookbooks/foundation/recipes/wiki.rb b/cookbooks/foundation/recipes/wiki.rb
index 749dcb923..2baa6c7f7 100644
--- a/cookbooks/foundation/recipes/wiki.rb
+++ b/cookbooks/foundation/recipes/wiki.rb
@@ -40,7 +40,6 @@ mediawiki_site "wiki.osmfoundation.org" do
   recaptcha_public_key "6LflIQATAAAAAMXyDWpba-FgipVzE-aGF4HIR59N"
   recaptcha_private_key passwords["wiki"]["recaptcha"]
   extra_file_extensions ["mp3"]
-  version "1.29"
 end
 
 mediawiki_skin "osmf" do
diff --git a/cookbooks/mediawiki/resources/site.rb b/cookbooks/mediawiki/resources/site.rb
index 0995c11fe..7f362cd88 100644
--- a/cookbooks/mediawiki/resources/site.rb
+++ b/cookbooks/mediawiki/resources/site.rb
@@ -22,7 +22,7 @@ default_action :create
 property :site, :kind_of => String, :name_attribute => true
 property :aliases, :kind_of => [String, Array]
 property :directory, :kind_of => String
-property :version, :kind_of => String, :default => "1.28"
+property :version, :kind_of => String, :default => "1.29"
 property :database_name, :kind_of => String, :required => true
 property :database_user, :kind_of => String, :required => true
 property :database_password, :kind_of => String, :required => true
diff --git a/roles/wiki.rb b/roles/wiki.rb
index 38aa6cd5c..94f6ae3f8 100644
--- a/roles/wiki.rb
+++ b/roles/wiki.rb
@@ -18,7 +18,7 @@ default_attributes(
     }
   },
   :elasticsearch => {
-    :version => "2.x",
+    :version => "5.x",
     :cluster => {
       :name => "wiki"
     },
-- 
2.39.5