Update wiki to mediawiki 1.28

diff --git a/cookbooks/foundation/recipes/board.rb b/cookbooks/foundation/recipes/board.rb
index 3d01599a67bbc79ae8494ef50e241ab55b941a70..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"]
   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
 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 6df491ca3f9aa92e008f4526b41ce88bacf8bd9d..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"]
   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
 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 83df8a4cb9d0e8566259f30fe55bfb5a1458430d..a652d6ae843a2c2c03d99e09602bef3aab083426 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"]
   recaptcha_public_key "6LflIQATAAAAAMXyDWpba-FgipVzE-aGF4HIR59N"
   recaptcha_private_key passwords["wiki"]["recaptcha"]
   extra_file_extensions ["mp3"]

-  version "1.28"

 end
 
 mediawiki_skin "osmf" do
 end
 
 mediawiki_skin "osmf" do

diff --git a/cookbooks/mediawiki/resources/site.rb b/cookbooks/mediawiki/resources/site.rb
index 2521bc65ddfdcc940d67a5e4a0613efe13530d82..3756137d2815b25291c9e8ffb613342478332d1f 100644 (file)
--- 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 :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
 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 9298395afb272362099d8b3baaa92baa091a79e2..4b419aa16920f453665f4344bcfd158354872df0 100644 (file)
--- a/roles/wiki.rb
+++ b/roles/wiki.rb
@@ -8,6 +8,7 @@ default_attributes(
     }
   },
   :elasticsearch => {
     }
   },
   :elasticsearch => {

+    :version => "2.x",

     :cluster => {
       :name => "wiki"
     },
     :cluster => {
       :name => "wiki"
     },