X-Git-Url: https://git.openstreetmap.org./chef.git/blobdiff_plain/db8d46b7feeaefdb105dd0ed9c6d0d0084250b92..524a7ce279b8975ebe0dfb61f8f9f637e5f04b0f:/cookbooks/mediawiki/resources/site.rb

diff --git a/cookbooks/mediawiki/resources/site.rb b/cookbooks/mediawiki/resources/site.rb
index 351ab9dca..3324e1f9f 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.29"
+property :version, :kind_of => String, :default => "1.31"
 property :database_name, :kind_of => String, :required => true
 property :database_user, :kind_of => String, :required => true
 property :database_password, :kind_of => String, :required => true
@@ -39,7 +39,7 @@ property :site_readonly, :kind_of => [String, TrueClass, FalseClass], :default =
 property :admin_user, :kind_of => String, :default => "Admin"
 property :admin_password, :kind_of => String, :required => true
 property :private_accounts, :kind_of => [TrueClass, FalseClass], :default => false
-property :private, :kind_of => [TrueClass, FalseClass], :default => false
+property :private_site, :kind_of => [TrueClass, FalseClass], :default => false
 property :recaptcha_public_key, :kind_of => String
 property :recaptcha_private_key, :kind_of => String
 property :extra_file_extensions, :kind_of => [String, Array], :default => []
@@ -128,7 +128,6 @@ action :create do
   ruby_block "catch-installer-localsettings-run" do
     action :run
     block do
-      #
     end
     not_if do
       ::File.exist?("#{mediawiki_directory}/LocalSettings-install.php")
@@ -218,7 +217,7 @@ action :create do
     update_site false
   end
 
-  if new_resource.private_accounts || new_resource.private
+  if new_resource.private_accounts || new_resource.private_site
     mediawiki_extension "ConfirmEdit" do
       site new_resource.site
       update_site false
@@ -310,36 +309,27 @@ action :create do
     update_site false
   end
 
-  # MediaWiki Language Extension Bundle
-  # FIXME: should automatically resolve tag
-  mw_lang_ext_bundle_tag = "2017.01"
-
   mediawiki_extension "Babel" do
     site new_resource.site
     template "mw-ext-Babel.inc.php.erb"
-    # tag mw_lang_ext_bundle_tag
-    tag mw_lang_ext_bundle_tag
     update_site false
   end
 
   mediawiki_extension "cldr" do
     site new_resource.site
     template "mw-ext-cldr.inc.php.erb"
-    tag mw_lang_ext_bundle_tag
     update_site false
   end
 
   mediawiki_extension "CleanChanges" do
     site new_resource.site
     template "mw-ext-CleanChanges.inc.php.erb"
-    tag mw_lang_ext_bundle_tag
     update_site false
   end
 
   mediawiki_extension "LocalisationUpdate" do
     site new_resource.site
     template "mw-ext-LocalisationUpdate.inc.php.erb"
-    tag mw_lang_ext_bundle_tag
     update_site false
   end
 
@@ -356,25 +346,26 @@ action :create do
   # mediawiki_extension "Translate" do
   #   site new_resource.site
   #   template "mw-ext-Translate.inc.php.erb"
-  #   tag mw_lang_ext_bundle_tag
   #   update_site false
   # end
 
   mediawiki_extension "UniversalLanguageSelector" do
     site new_resource.site
-    tag mw_lang_ext_bundle_tag
+    template "mw-ext-UniversalLanguageSelector.inc.php.erb"
     update_site false
   end
 
   mediawiki_extension "AntiSpoof" do
     site new_resource.site
     template "mw-ext-AntiSpoof.inc.php.erb"
+    compose true
     update_site false
   end
 
   mediawiki_extension "AbuseFilter" do
     site new_resource.site
     template "mw-ext-AbuseFilter.inc.php.erb"
+    compose true
     update_site false
   end
 
@@ -391,6 +382,7 @@ action :create do
 
   mediawiki_extension "Elastica" do
     site new_resource.site
+    compose true
     update_site false
   end
 
@@ -442,6 +434,11 @@ action :create do
     update_site false
   end
 
+  mediawiki_extension "TemplateData" do
+    site new_resource.site
+    update_site false
+  end
+
   cookbook_file "#{site_directory}/cc-wiki.png" do
     cookbook "mediawiki"
     owner node[:mediawiki][:user]
@@ -475,7 +472,7 @@ action :create do
     template "apache.erb"
     directory site_directory
     variables :aliases => Array(new_resource.aliases),
-              :private => new_resource.private
+              :private_site => new_resource.private_site
     reload_apache false
   end
 
@@ -566,7 +563,7 @@ action_class do
       :site_readonly => new_resource.site_readonly,
       :extra_file_extensions => new_resource.extra_file_extensions,
       :private_accounts => new_resource.private_accounts,
-      :private => new_resource.private
+      :private_site => new_resource.private_site
     }
   end
 end