From: Tom Hughes <tom@compton.nu>
Date: Wed, 10 Aug 2022 21:22:21 +0000 (+0100)
Subject: Make handling of external matomo plugins more robust
X-Git-Url: https://git.openstreetmap.org./chef.git/commitdiff_plain/f69c7cd9dec2f2f5a2eab9e3318864c8151a06df

Make handling of external matomo plugins more robust
---

diff --git a/cookbooks/matomo/recipes/default.rb b/cookbooks/matomo/recipes/default.rb
index e892767d9..2cbd469b6 100644
--- a/cookbooks/matomo/recipes/default.rb
+++ b/cookbooks/matomo/recipes/default.rb
@@ -60,8 +60,11 @@ node[:matomo][:plugins].each do |plugin_name, plugin_version|
   end
 
   archive_file "#{Chef::Config[:file_cache_path]}/matomo-#{plugin_name}-#{plugin_version}.zip" do
-    destination "/opt/matomo-#{version}/matomo/plugins"
-    overwrite :auto
+    destination "/opt/matomo-#{plugin_name}-#{plugin_version}"
+  end
+
+  link "/opt/matomo-#{version}/matomo/plugins/#{plugin_name}" do
+    to "/opt/matomo-#{plugin_name}-#{plugin_version}/#{plugin_name}"
     notifies :run, "notify_group[matomo-updated]"
   end
 end