From: Tom Hughes <tom@compton.nu>
Date: Sun, 1 Nov 2020 19:22:23 +0000 (+0000)
Subject: Set COMPOSER_HOME when running composer
X-Git-Url: https://git.openstreetmap.org/chef.git/commitdiff_plain/cf52e644e56c309c9fcca0f0b3be0e86dd04b21e

Set COMPOSER_HOME when running composer
---

diff --git a/cookbooks/mediawiki/resources/extension.rb b/cookbooks/mediawiki/resources/extension.rb
index 8e7fbaa4b..9f477a53f 100644
--- a/cookbooks/mediawiki/resources/extension.rb
+++ b/cookbooks/mediawiki/resources/extension.rb
@@ -89,6 +89,7 @@ action :create do
     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
diff --git a/cookbooks/mediawiki/resources/site.rb b/cookbooks/mediawiki/resources/site.rb
index 797b59409..1bd9acb93 100644
--- a/cookbooks/mediawiki/resources/site.rb
+++ b/cookbooks/mediawiki/resources/site.rb
@@ -125,6 +125,7 @@ action :create do
     cwd mediawiki_directory
     user node[:mediawiki][:user]
     group node[:mediawiki][:group]
+    environment "COMPOSER_HOME" => site_directory
   end
 
   template "#{mediawiki_directory}/composer.local.json" do