Move readonly load to katla

[chef.git] / cookbooks / piwik / recipes / default.rb

diff --git a/cookbooks/piwik/recipes/default.rb b/cookbooks/piwik/recipes/default.rb
index 376b96e4f08bb417788e405881446943512a1273..a3eb24ad8ebda0d4892d695b99ea0611d21ccd21 100644 (file)
--- a/cookbooks/piwik/recipes/default.rb
+++ b/cookbooks/piwik/recipes/default.rb
@@ -43,13 +43,13 @@ directory "/opt/piwik-#{version}" do
   mode "0755"
 end
 
   mode "0755"
 end
 

-remote_file "/tmp/piwik-#{version}.zip" do
+remote_file "#{Chef::Config[:file_cache_path]}/piwik-#{version}.zip" do

   source "http://builds.piwik.org/piwik-#{version}.zip"
   not_if { File.exist?("/opt/piwik-#{version}/piwik") }
 end
 
 execute "unzip-piwik-#{version}" do
   source "http://builds.piwik.org/piwik-#{version}.zip"
   not_if { File.exist?("/opt/piwik-#{version}/piwik") }
 end
 
 execute "unzip-piwik-#{version}" do

-  command "unzip -q /tmp/piwik-#{version}.zip"
+  command "unzip -q #{Chef::Config[:file_cache_path]}/piwik-#{version}.zip"

   cwd "/opt/piwik-#{version}"
   user "root"
   group "root"
   cwd "/opt/piwik-#{version}"
   user "root"
   group "root"


@@ -67,7 +67,9 @@ template "/opt/piwik-#{version}/piwik/config/config.ini.php" do
   owner "root"
   group "root"
   mode "0644"
   owner "root"
   group "root"
   mode "0644"

-  variables :passwords => passwords
+  variables :passwords => passwords,
+            :directory => "/opt/piwik-#{version}/piwik",
+            :plugins => node[:piwik][:plugins]

 end
 
 directory "/opt/piwik-#{version}/piwik/tmp" do
 end
 
 directory "/opt/piwik-#{version}/piwik/tmp" do