Make sure cgimap uses the writable database for updates

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

diff --git a/cookbooks/mediawiki/resources/site.rb b/cookbooks/mediawiki/resources/site.rb
index 185798bc6adb0b30d47bc52e278ef35db17e6e62..430cba884da20c0a8badf655b066f4ad532041d6 100644 (file)
--- 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 :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 => []
 property :recaptcha_public_key, :kind_of => String
 property :recaptcha_private_key, :kind_of => String
 property :extra_file_extensions, :kind_of => [String, Array], :default => []


@@ -187,7 +187,19 @@ action :create do
               :database_params => database_params
   end
 
               :database_params => database_params
   end
 

-  mediawiki_skin "CologneBlue" do # ~FC005
+  # MobileFrontend extension is required by MinervaNeue skin
+  mediawiki_extension "MobileFrontend" do # ~FC005
+    site new_resource.site
+    template "mw-ext-MobileFrontend.inc.php.erb"
+  end
+
+  # MobileFrontend extension is required by MinervaNeue skin
+  mediawiki_skin "MinervaNeue" do # ~FC005
+    site new_resource.site
+    update_site false
+  end
+
+  mediawiki_skin "CologneBlue" do

     site new_resource.site
     update_site false
   end
     site new_resource.site
     update_site false
   end


@@ -217,7 +229,7 @@ action :create do
     update_site false
   end
 
     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
     mediawiki_extension "ConfirmEdit" do
       site new_resource.site
       update_site false


@@ -250,6 +262,7 @@ action :create do
 
   mediawiki_extension "Interwiki" do
     site new_resource.site
 
   mediawiki_extension "Interwiki" do
     site new_resource.site

+    template "mw-ext-Interwiki.inc.php.erb"

     update_site false
   end
 
     update_site false
   end
 


@@ -351,6 +364,7 @@ action :create do
 
   mediawiki_extension "UniversalLanguageSelector" do
     site new_resource.site
 
   mediawiki_extension "UniversalLanguageSelector" do
     site new_resource.site

+    template "mw-ext-UniversalLanguageSelector.inc.php.erb"

     update_site false
   end
 
     update_site false
   end
 


@@ -387,6 +401,7 @@ action :create do
 
   mediawiki_extension "CirrusSearch" do
     site new_resource.site
 
   mediawiki_extension "CirrusSearch" do
     site new_resource.site

+    compose true

     template "mw-ext-CirrusSearch.inc.php.erb"
     update_site false
   end
     template "mw-ext-CirrusSearch.inc.php.erb"
     update_site false
   end


@@ -471,7 +486,7 @@ action :create do
     template "apache.erb"
     directory site_directory
     variables :aliases => Array(new_resource.aliases),
     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
 
     reload_apache false
   end
 


@@ -562,7 +577,7 @@ action_class do
       :site_readonly => new_resource.site_readonly,
       :extra_file_extensions => new_resource.extra_file_extensions,
       :private_accounts => new_resource.private_accounts,
       :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
     }
   end
 end