Generate letsencrypt certificates for mediawiki sites

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

diff --git a/cookbooks/mediawiki/resources/site.rb b/cookbooks/mediawiki/resources/site.rb
index a210e806b6ac8498b6486f27b4a8b83a4b222b2f..2521bc65ddfdcc940d67a5e4a0613efe13530d82 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 :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
@@ -34,14 +34,12 @@ 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 :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 :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
@@ -75,7 +73,7 @@ def mediawiki_params
     :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
   }