Convert ohai_plugin to an LWRP

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

diff --git a/cookbooks/otrs/recipes/default.rb b/cookbooks/otrs/recipes/default.rb
index 487fddf90e3cdc23c2a00bce0e28234e1d0f9d32..18b0c2ea613d1ce875f980a7e43f6aa0aec51ae9 100644 (file)
--- a/cookbooks/otrs/recipes/default.rb
+++ b/cookbooks/otrs/recipes/default.rb
@@ -34,25 +34,26 @@ package "libmail-imapclient-perl"
 package "libnet-ldap-perl"
 package "libpdf-api2-perl"
 package "libsoap-lite-perl"
+package "libyaml-libyaml-perl"
+package "libcrypt-eksblowfish-perl"
 
 apache_module "headers"
 
 version = node[:otrs][:version]
 user = node[:otrs][:user]
-group = node[:otrs][:group]
 database_cluster = node[:otrs][:database_cluster]
 database_name = node[:otrs][:database_name]
 database_user = node[:otrs][:database_user]
 database_password = passwords[node[:otrs][:database_password]]
 site = node[:otrs][:site]
 
-remote_file "/tmp/otrs-#{version}.tar.bz2" do
+remote_file "#{Chef::Config[:file_cache_path]}/otrs-#{version}.tar.bz2" do
   source "http://ftp.otrs.org/pub/otrs/otrs-#{version}.tar.bz2"
   not_if { File.exist?("/opt/otrs-#{version}") }
 end
 
 execute "untar-otrs-#{version}" do
-  command "tar jxf /tmp/otrs-#{version}.tar.bz2"
+  command "tar jxf #{Chef::Config[:file_cache_path]}/otrs-#{version}.tar.bz2"
   cwd "/opt"
   user "root"
   group "root"
@@ -93,7 +94,7 @@ execute "/opt/otrs/bin/otrs.SetPermissions.pl" do
   command "/opt/otrs/bin/otrs.SetPermissions.pl --otrs-user=#{user} --web-user=www-data --otrs-group=www-data --web-group=www-data /opt/otrs-#{version}"
   user "root"
   group "root"
-  not_if { File.stat("/opt/otrs/README").uid != Etc.getpwnam("otrs").uid }
+  not_if { File.stat("/opt/otrs/README.md").uid != Etc.getpwnam("otrs").uid }
 end
 
 execute "/opt/otrs/bin/otrs.RebuildConfig.pl" do
@@ -131,7 +132,7 @@ Dir.glob("/opt/otrs/var/cron/*.dist") do |distname|
     group "www-data"
     mode 0664
     content IO.read(distname)
-    notifies :run, resources(:execute => "/opt/otrs/bin/Cron.sh")
+    notifies :run, "execute[/opt/otrs/bin/Cron.sh]"
   end
 end