Remove traces of hp-legacy which break modern hp-health

[chef.git] / cookbooks / mediawiki / resources / site.rb

diff --git a/cookbooks/mediawiki/resources/site.rb b/cookbooks/mediawiki/resources/site.rb
index 32916d2bcee38fc452fc08eb7da428ec86b8d69a..b05ebe4c313601de226b271f381d697ee8e769a2 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.24"
+attribute :version, :kind_of => String, :default => "1.26"

 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


@@ -34,9 +34,9 @@ attribute :email_contact, :kind_of => String, :default => ""
 attribute :email_sender, :kind_of => String, :default => ""
 attribute :email_sender_name, :kind_of => String, :default => "MediaWiki Mail"
 attribute :commons, :kind_of => [TrueClass, FalseClass], :default => true
 attribute :email_sender, :kind_of => String, :default => ""
 attribute :email_sender_name, :kind_of => String, :default => "MediaWiki Mail"
 attribute :commons, :kind_of => [TrueClass, FalseClass], :default => true

-attribute :skin, :kind_of => String, :default =>  "vector"
-attribute :site_notice, :kind_of => String, :default => ""
-attribute :site_readonly, :kind_of => [TrueClass, FalseClass], :default => false
+attribute :skin, :kind_of => String, :default => "vector"
+attribute :site_notice, :kind_of => [String, TrueClass, FalseClass], :default => false
+attribute :site_readonly, :kind_of => [String, TrueClass, FalseClass], :default => false

 attribute :admin_user, :kind_of => String, :default => "Admin"
 attribute :admin_password, :kind_of => String, :required => true
 attribute :ssl_enabled, :kind_of => [TrueClass, FalseClass], :default => false
 attribute :admin_user, :kind_of => String, :default => "Admin"
 attribute :admin_password, :kind_of => String, :required => true
 attribute :ssl_enabled, :kind_of => [TrueClass, FalseClass], :default => false


@@ -46,7 +46,7 @@ attribute :private_accounts, :kind_of => [TrueClass, FalseClass], :default => fa
 attribute :private, :kind_of => [TrueClass, FalseClass], :default => false
 attribute :recaptcha_public_key, :kind_of => String
 attribute :recaptcha_private_key, :kind_of => String
 attribute :private, :kind_of => [TrueClass, FalseClass], :default => false
 attribute :recaptcha_public_key, :kind_of => String
 attribute :recaptcha_private_key, :kind_of => String

-attribute :extra_file_extensions, :kind_of => [String, Array]
+attribute :extra_file_extensions, :kind_of => [String, Array], :default => []

 attribute :reload_apache, :kind_of => [TrueClass, FalseClass], :default => true
 
 def after_created
 attribute :reload_apache, :kind_of => [TrueClass, FalseClass], :default => true
 
 def after_created


@@ -75,7 +75,7 @@ def mediawiki_params
     :site_notice => site_notice,
     :site_readonly => site_readonly,
     :ssl_enabled => ssl_enabled,
     :site_notice => site_notice,
     :site_readonly => site_readonly,
     :ssl_enabled => ssl_enabled,

-    :extra_file_extensions  => extra_file_extensions,
+    :extra_file_extensions => extra_file_extensions,

     :private_accounts => private_accounts,
     :private => private
   }
     :private_accounts => private_accounts,
     :private => private
   }