Remove arcfour (RC4) cipher no longer available in newer OpenSSH

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

diff --git a/cookbooks/piwik/recipes/default.rb b/cookbooks/piwik/recipes/default.rb
index 02fb7a860cf3983d13d94cf93c39a433bbf35733..a3eb24ad8ebda0d4892d695b99ea0611d21ccd21 100644 (file)
--- a/cookbooks/piwik/recipes/default.rb
+++ b/cookbooks/piwik/recipes/default.rb
@@ -35,33 +35,52 @@ package "geoip-database-contrib"
 apache_module "php5"
 apache_module "geoip"
 
 apache_module "php5"
 apache_module "geoip"
 

-apache_site "piwik.openstreetmap.org" do
-  template "apache.erb"
-end
+version = node[:piwik][:version]

 
 

-directory "/srv/piwik.openstreetmap.org" do
+directory "/opt/piwik-#{version}" do

   owner "root"
   group "root"
   mode "0755"
 end
 
   owner "root"
   group "root"
   mode "0755"
 end
 

-directory "/srv/piwik.openstreetmap.org/config" do
-  owner "www-data"
-  group "www-data"
-  mode "0755"
+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
 
 end
 

-directory "/srv/piwik.openstreetmap.org/tmp" do
+execute "unzip-piwik-#{version}" do
+  command "unzip -q #{Chef::Config[:file_cache_path]}/piwik-#{version}.zip"
+  cwd "/opt/piwik-#{version}"
+  user "root"
+  group "root"
+  not_if { File.exist?("/opt/piwik-#{version}/piwik") }
+end
+
+directory "/opt/piwik-#{version}/piwik/config" do

   owner "www-data"
   group "www-data"
   mode "0755"
 end
 
   owner "www-data"
   group "www-data"
   mode "0755"
 end
 

-template "/etc/cron.d/piwiki" do
-  source "cron.erb"
+template "/opt/piwik-#{version}/piwik/config/config.ini.php" do
+  source "config.erb"

   owner "root"
   group "root"
   mode "0644"
   owner "root"
   group "root"
   mode "0644"

+  variables :passwords => passwords,
+            :directory => "/opt/piwik-#{version}/piwik",
+            :plugins => node[:piwik][:plugins]
+end
+
+directory "/opt/piwik-#{version}/piwik/tmp" do
+  owner "www-data"
+  group "www-data"
+  mode "0755"
+end
+
+link "/srv/piwik.openstreetmap.org" do
+  to "/opt/piwik-#{version}/piwik"
+  notifies :restart, "service[apache2]"

 end
 
 mysql_user "piwik@localhost" do
 end
 
 mysql_user "piwik@localhost" do


@@ -71,3 +90,14 @@ end
 mysql_database "piwik" do
   permissions "piwik@localhost" => :all
 end
 mysql_database "piwik" do
   permissions "piwik@localhost" => :all
 end

+
+apache_site "piwik.openstreetmap.org" do
+  template "apache.erb"
+end
+
+template "/etc/cron.d/piwiki" do
+  source "cron.erb"
+  owner "root"
+  group "root"
+  mode "0644"
+end