X-Git-Url: https://git.openstreetmap.org./chef.git/blobdiff_plain/298f0480877d5ac97a527c49a2ecf74b57a69024..d047e6a1f0be64a52f9700bb63a480c25cee6be2:/cookbooks/otrs/recipes/default.rb

diff --git a/cookbooks/otrs/recipes/default.rb b/cookbooks/otrs/recipes/default.rb
index 55429af4d..18b0c2ea6 100644
--- a/cookbooks/otrs/recipes/default.rb
+++ b/cookbooks/otrs/recipes/default.rb
@@ -18,8 +18,11 @@
 #
 
 include_recipe "tools"
+include_recipe "postgresql"
 include_recipe "apache::ssl"
 
+passwords = data_bag_item("otrs", "passwords")
+
 package "libapache2-mod-perl2"
 package "libapache2-reload-perl"
 
@@ -31,54 +34,55 @@ 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 = node[:otrs][:database_password]
+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"
   not_if { File.exist?("/opt/otrs-#{version}") }
 end
 
+config = edit_file "/opt/otrs-#{version}/Kernel/Config.pm.dist" do |line|
+  line.gsub!(/^( *)\$Self->{Database} = 'otrs'/, "\\1$Self->{Database} = '#{database_name}'")
+  line.gsub!(/^( *)\$Self->{DatabaseUser} = 'otrs'/, "\\1$Self->{DatabaseUser} = '#{database_user}'")
+  line.gsub!(/^( *)\$Self->{DatabasePw} = 'some-pass'/, "\\1$Self->{DatabasePw} = '#{database_password}'")
+  line.gsub!(/^( *)\$Self->{Database} = 'otrs'/, "\\1$Self->{Database} = '#{database_name}'")
+  line.gsub!(/^( *\$Self->{DatabaseDSN} = "DBI:mysql:)/, "#\\1")
+  line.gsub!(/^#( *\$Self->{DatabaseDSN} = "DBI:Pg:.*;host=)/, "\\1")
+
+  line
+end
+
 file "/opt/otrs-#{version}/Kernel/Config.pm" do
   owner user
   group "www-data"
   mode 0664
-  content_from_file "/opt/otrs-#{version}/Kernel/Config.pm.dist" do |line|
-    line.gsub!(/^( *)\$Self->{Database} = 'otrs'/, "\\1$Self->{Database} = '#{database_name}'")
-    line.gsub!(/^( *)\$Self->{DatabaseUser} = 'otrs'/, "\\1$Self->{DatabaseUser} = '#{database_user}'")
-    line.gsub!(/^( *)\$Self->{DatabasePw} = 'some-pass'/, "\\1$Self->{DatabasePw} = '#{database_password}'")
-    line.gsub!(/^( *)\$Self->{Database} = 'otrs'/, "\\1$Self->{Database} = '#{database_name}'")
-    line.gsub!(/^( *\$Self->{DatabaseDSN} = "DBI:mysql:)/, "#\\1")
-    line.gsub!(/^#( *\$Self->{DatabaseDSN} = "DBI:Pg:.*;host=)/, "\\1")
-
-    line
-  end
+  content config
 end
 
 file "/opt/otrs-#{version}/Kernel/Config/GenericAgent.pm" do
   owner user
   group "www-data"
   mode 0664
-  content_from_file "/opt/otrs-#{version}/Kernel/Config/GenericAgent.pm.dist" do |line|
-    line
-  end
+  content IO.read("/opt/otrs-#{version}/Kernel/Config/GenericAgent.pm.dist")
 end
 
 link "/opt/otrs" do
@@ -90,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
@@ -128,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