Update wiki to mediawiki 1.29

diff --git a/cookbooks/foundation/recipes/board.rb b/cookbooks/foundation/recipes/board.rb
index 0a4cca79fa1595423bf53a6f2a6bc8f2463f35c4..390576f0cb56e5a8bfb33f2e32bbebe0734f4d4b 100644 (file)
--- 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 47e6f3cf8f96465db37f653eb35fa1a3f66b9a86..3fde37b17b7b8c8541b95ddf7557405f98765de9 100644 (file)
--- 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 749dcb9237430a9385529e83bacebbc58063aeb2..2baa6c7f73247ec5417c3563c7dd768f91d51ec2 100644 (file)
--- 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 0995c11fee918c2f19f892838db98eee217537d3..7f362cd8879e69a60f631ef8fc75c8e5b14e1af8 100644 (file)
--- 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 38aa6cd5ce2b184072b9a4b8d0c97d41c55e6e39..94f6ae3f8edecd13790ca2b90a2769324ce34f96 100644 (file)
--- a/roles/wiki.rb
+++ b/roles/wiki.rb
@@ -18,7 +18,7 @@ default_attributes(
     }
   },
   :elasticsearch => {
-    :version => "2.x",
+    :version => "5.x",
     :cluster => {
       :name => "wiki"
     },