X-Git-Url: https://git.openstreetmap.org./chef.git/blobdiff_plain/aeaa46f3071de018b5c5e0f5678cb5b4082e3ddc..45c0862be818c87ac9825ed36a7a2e9d3a1aab7c:/cookbooks/mediawiki/resources/extension.rb?ds=sidebyside diff --git a/cookbooks/mediawiki/resources/extension.rb b/cookbooks/mediawiki/resources/extension.rb index 4b44fa3d1..6240f6e87 100644 --- a/cookbooks/mediawiki/resources/extension.rb +++ b/cookbooks/mediawiki/resources/extension.rb @@ -17,6 +17,8 @@ # limitations under the License. # +unified_mode true + default_action :create property :extension, :kind_of => String, :name_property => true @@ -41,7 +43,7 @@ action :create do mode "755" 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 @@ -82,16 +84,6 @@ action :create do mode "664" end end - - execute "#{extension_directory}/composer.json" do - action :nothing - command "composer update --no-dev" - cwd mediawiki_directory - user node[:mediawiki][:user] - group node[:mediawiki][:group] - only_if { ::File.exist?("#{extension_directory}/composer.json") } - subscribes :run, "git[#{extension_directory}]" - end end action :delete do @@ -128,12 +120,5 @@ action_class do end def after_created - if update_site - notifies :update, "mediawiki_site[#{site}]" - else - site_directory = node[:mediawiki][:sites][site][:directory] - - notifies :create, "template[#{site_directory}/w/LocalSettings.php]" - notifies :run, "execute[#{site_directory}/w/maintenance/update.php]" - end + notifies :update, "mediawiki_site[#{site}]" if update_site end