X-Git-Url: https://git.openstreetmap.org/chef.git/blobdiff_plain/316225f5a6da64609cef4d090047b92bffef49a6..2514acf0366bc0cdd14c51eb2e5b60e2569413f2:/cookbooks/mediawiki/resources/extension.rb diff --git a/cookbooks/mediawiki/resources/extension.rb b/cookbooks/mediawiki/resources/extension.rb index e7b3bc046..152e843d3 100644 --- a/cookbooks/mediawiki/resources/extension.rb +++ b/cookbooks/mediawiki/resources/extension.rb @@ -8,7 +8,7 @@ # you may not use this file except in compliance with the License. # You may obtain a copy of the License at # -# http://www.apache.org/licenses/LICENSE-2.0 +# https://www.apache.org/licenses/LICENSE-2.0 # # Unless required by applicable law or agreed to in writing, software # distributed under the License is distributed on an "AS IS" BASIS, @@ -23,11 +23,13 @@ property :extension, :kind_of => String, :name_attribute => true property :site, :kind_of => String, :required => true property :source, :kind_of => String property :template, :kind_of => String +property :template_cookbook, :kind_of => String, :default => "mediawiki" property :variables, :kind_of => Hash, :default => {} property :version, :kind_of => String property :repository, :kind_of => String property :tag, :kind_of => String property :reference, :kind_of => String +property :compose, :kind_of => [TrueClass, FalseClass], :default => false property :update_site, :kind_of => [TrueClass, FalseClass], :default => true action :create do @@ -65,7 +67,7 @@ action :create do if new_resource.template # ~FC023 declare_resource :template, "#{mediawiki_directory}/LocalSettings.d/Ext-#{new_resource.extension}.inc.php" do - cookbook "mediawiki" + cookbook new_resource.template_cookbook source new_resource.template user node[:mediawiki][:user] group node[:mediawiki][:group] @@ -83,6 +85,17 @@ action :create do only_if { ::File.exist?(extension_script) } end end + + if new_resource.compose # ~FC023 + execute "composer-#{new_resource.extension}" do + action :nothing + command "composer install --no-dev" + cwd extension_directory + user node[:mediawiki][:user] + group node[:mediawiki][:group] + subscribes :run, "git[#{extension_directory}]" + end + end end action :delete do