X-Git-Url: https://git.openstreetmap.org./chef.git/blobdiff_plain/aff3fbe6802d93a8deae8fa2637589c8d28f6681..f5296ebe7c9608620d72fe3936706a0408a30c5b:/cookbooks/mediawiki/resources/site.rb?ds=sidebyside diff --git a/cookbooks/mediawiki/resources/site.rb b/cookbooks/mediawiki/resources/site.rb index e7838ed0f..2521bc65d 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.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 @@ -35,13 +35,11 @@ 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 :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 :ssl_certificate, :kind_of => String -attribute :ssl_certificate_chain, :kind_of => String attribute :private_accounts, :kind_of => [TrueClass, FalseClass], :default => false attribute :private, :kind_of => [TrueClass, FalseClass], :default => false attribute :recaptcha_public_key, :kind_of => String