mediawiki: ensure caches are set to expected value

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

diff --git a/cookbooks/mediawiki/resources/extension.rb b/cookbooks/mediawiki/resources/extension.rb
index 19197576f5506764564ada58737b30315b1fc857..4e44f18c2ad426fd8d81c810d137e58bebcc7701 100644 (file)
--- a/cookbooks/mediawiki/resources/extension.rb
+++ b/cookbooks/mediawiki/resources/extension.rb
@@ -17,6 +17,8 @@
 # limitations under the License.
 #
 
 # limitations under the License.
 #
 

+unified_mode true
+

 default_action :create
 
 property :extension, :kind_of => String, :name_property => true
 default_action :create
 
 property :extension, :kind_of => String, :name_property => true


@@ -38,10 +40,10 @@ action :create do
       source new_resource.source
       owner node[:mediawiki][:user]
       group node[:mediawiki][:group]
       source new_resource.source
       owner node[:mediawiki][:user]
       group node[:mediawiki][:group]

-      mode 0o755
+      mode "755"

       files_owner node[:mediawiki][:user]
       files_group node[:mediawiki][:group]
       files_owner node[:mediawiki][:user]
       files_group node[:mediawiki][:group]

-      files_mode 0o755
+      files_mode "755"

     end
   else
     extension_repository = new_resource.repository || default_repository
     end
   else
     extension_repository = new_resource.repository || default_repository


@@ -57,6 +59,7 @@ action :create do
       action :sync
       repository extension_repository
       reference extension_reference
       action :sync
       repository extension_repository
       reference extension_reference

+      depth 1

       enable_submodules true
       user node[:mediawiki][:user]
       group node[:mediawiki][:group]
       enable_submodules true
       user node[:mediawiki][:user]
       group node[:mediawiki][:group]


@@ -70,7 +73,7 @@ action :create do
       source new_resource.template
       user node[:mediawiki][:user]
       group node[:mediawiki][:group]
       source new_resource.template
       user node[:mediawiki][:user]
       group node[:mediawiki][:group]

-      mode 0o664
+      mode "664"

       variables new_resource.variables
     end
   else
       variables new_resource.variables
     end
   else


@@ -78,7 +81,7 @@ action :create do
       content "<?php wfLoadExtension( '#{new_resource.extension}' );\n"
       user node[:mediawiki][:user]
       group node[:mediawiki][:group]
       content "<?php wfLoadExtension( '#{new_resource.extension}' );\n"
       user node[:mediawiki][:user]
       group node[:mediawiki][:group]

-      mode 0o664
+      mode "664"

     end
   end
 
     end
   end
 


@@ -88,6 +91,7 @@ action :create do
     cwd mediawiki_directory
     user node[:mediawiki][:user]
     group node[:mediawiki][:group]
     cwd mediawiki_directory
     user node[:mediawiki][:user]
     group node[:mediawiki][:group]

+    environment "COMPOSER_HOME" => site_directory

     only_if { ::File.exist?("#{extension_directory}/composer.json") }
     subscribes :run, "git[#{extension_directory}]"
   end
     only_if { ::File.exist?("#{extension_directory}/composer.json") }
     subscribes :run, "git[#{extension_directory}]"
   end