From: Tom Hughes <tom@compton.nu>
Date: Sat, 25 Feb 2017 11:09:48 +0000 (+0000)
Subject: Update wiki to mediawiki 1.28
X-Git-Url: https://git.openstreetmap.org./chef.git/commitdiff_plain/a9fa15ee42760a1c6073d01547dd8907b202d65b

Update wiki to mediawiki 1.28
---

diff --git a/cookbooks/foundation/recipes/board.rb b/cookbooks/foundation/recipes/board.rb
index 3d01599a6..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.28"
 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 6df491ca3..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.28"
 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 83df8a4cb..a652d6ae8 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.28"
 end
 
 mediawiki_skin "osmf" do
diff --git a/cookbooks/mediawiki/resources/site.rb b/cookbooks/mediawiki/resources/site.rb
index 2521bc65d..3756137d2 100644
--- a/cookbooks/mediawiki/resources/site.rb
+++ b/cookbooks/mediawiki/resources/site.rb
@@ -23,7 +23,7 @@ default_action :create
 attribute :name, :kind_of => String, :name_attribute => true
 attribute :aliases, :kind_of => [String, Array]
 attribute :directory, :kind_of => String
-attribute :version, :kind_of => String, :default => "1.26"
+attribute :version, :kind_of => String, :default => "1.28"
 attribute :database_name, :kind_of => String, :required => true
 attribute :database_user, :kind_of => String, :required => true
 attribute :database_password, :kind_of => String, :required => true
diff --git a/roles/wiki.rb b/roles/wiki.rb
index 9298395af..4b419aa16 100644
--- a/roles/wiki.rb
+++ b/roles/wiki.rb
@@ -8,6 +8,7 @@ default_attributes(
     }
   },
   :elasticsearch => {
+    :version => "2.x",
     :cluster => {
       :name => "wiki"
     },