Modernise shorewall configuration

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

diff --git a/cookbooks/mediawiki/resources/site.rb b/cookbooks/mediawiki/resources/site.rb
index 351ab9dcabed381d3e372d82b6669fdbe3fe81e4..d2c2ec92a0fdd03e2e8e586be67665c5f18cb61d 100644 (file)
--- a/cookbooks/mediawiki/resources/site.rb
+++ b/cookbooks/mediawiki/resources/site.rb
@@ -22,7 +22,7 @@ default_action :create
 property :site, :kind_of => String, :name_attribute => true
 property :aliases, :kind_of => [String, Array]
 property :directory, :kind_of => String
 property :site, :kind_of => String, :name_attribute => true
 property :aliases, :kind_of => [String, Array]
 property :directory, :kind_of => String

-property :version, :kind_of => String, :default => "1.29"
+property :version, :kind_of => String, :default => "1.31"

 property :database_name, :kind_of => String, :required => true
 property :database_user, :kind_of => String, :required => true
 property :database_password, :kind_of => String, :required => true
 property :database_name, :kind_of => String, :required => true
 property :database_user, :kind_of => String, :required => true
 property :database_password, :kind_of => String, :required => true


@@ -128,7 +128,6 @@ action :create do
   ruby_block "catch-installer-localsettings-run" do
     action :run
     block do
   ruby_block "catch-installer-localsettings-run" do
     action :run
     block do

-      #

     end
     not_if do
       ::File.exist?("#{mediawiki_directory}/LocalSettings-install.php")
     end
     not_if do
       ::File.exist?("#{mediawiki_directory}/LocalSettings-install.php")


@@ -369,12 +368,14 @@ action :create do
   mediawiki_extension "AntiSpoof" do
     site new_resource.site
     template "mw-ext-AntiSpoof.inc.php.erb"
   mediawiki_extension "AntiSpoof" do
     site new_resource.site
     template "mw-ext-AntiSpoof.inc.php.erb"

+    compose true

     update_site false
   end
 
   mediawiki_extension "AbuseFilter" do
     site new_resource.site
     template "mw-ext-AbuseFilter.inc.php.erb"
     update_site false
   end
 
   mediawiki_extension "AbuseFilter" do
     site new_resource.site
     template "mw-ext-AbuseFilter.inc.php.erb"

+    compose true

     update_site false
   end
 
     update_site false
   end
 


@@ -391,6 +392,7 @@ action :create do
 
   mediawiki_extension "Elastica" do
     site new_resource.site
 
   mediawiki_extension "Elastica" do
     site new_resource.site

+    compose true

     update_site false
   end
 
     update_site false
   end
 


@@ -442,6 +444,11 @@ action :create do
     update_site false
   end
 
     update_site false
   end
 

+  mediawiki_extension "TemplateData" do
+    site new_resource.site
+    update_site false
+  end
+

   cookbook_file "#{site_directory}/cc-wiki.png" do
     cookbook "mediawiki"
     owner node[:mediawiki][:user]
   cookbook_file "#{site_directory}/cc-wiki.png" do
     cookbook "mediawiki"
     owner node[:mediawiki][:user]