X-Git-Url: https://git.openstreetmap.org/chef.git/blobdiff_plain/13713e5c16b9715fbae41cfe88067628041d3270..0b38187153c7cd47c6690c9741580751b4af24a1:/cookbooks/mediawiki/resources/site.rb

diff --git a/cookbooks/mediawiki/resources/site.rb b/cookbooks/mediawiki/resources/site.rb
index 418108384..57f30549b 100644
--- a/cookbooks/mediawiki/resources/site.rb
+++ b/cookbooks/mediawiki/resources/site.rb
@@ -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 => []
@@ -187,6 +187,11 @@ action :create do
               :database_params => database_params
   end
 
+  mediawiki_skin "MinervaNeue" do # ~FC005
+    site new_resource.site
+    update_site false
+  end
+
   mediawiki_skin "CologneBlue" do # ~FC005
     site new_resource.site
     update_site false
@@ -217,7 +222,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
@@ -388,6 +393,7 @@ action :create do
 
   mediawiki_extension "CirrusSearch" do
     site new_resource.site
+    compose true
     template "mw-ext-CirrusSearch.inc.php.erb"
     update_site false
   end
@@ -472,7 +478,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
 
@@ -563,7 +569,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