Remvoe cleanup code

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

diff --git a/cookbooks/otrs/recipes/default.rb b/cookbooks/otrs/recipes/default.rb
index c71c920c61274167d4244bc05e5eb1e444a79058..dd5994b20fb12469fd4998c76296a746c4316d71 100644 (file)
--- a/cookbooks/otrs/recipes/default.rb
+++ b/cookbooks/otrs/recipes/default.rb
@@ -47,6 +47,7 @@ database_name = node[:otrs][:database_name]
 database_user = node[:otrs][:database_user]
 database_password = passwords[node[:otrs][:database_password]]
 site = node[:otrs][:site]
+site_aliases = node[:otrs][:site_aliases] || []
 
 postgresql_user database_user do
   cluster database_cluster
@@ -79,6 +80,7 @@ config = edit_file "/opt/otrs-#{version}/Kernel/Config.pm.dist" do |line|
   line.gsub!(/^( *\$Self->{DatabaseDSN} = "DBI:mysql:)/, "#\\1")
   line.gsub!(/^#( *\$Self->{DatabaseDSN} = "DBI:Pg:.*;host=)/, "\\1")
   line.gsub!(/^( *)# (\$Self->{CheckMXRecord} = 0)/, "\\1\\2")
+  line.gsub!(/^( *)# \$Self->{SessionUseCookie} = 0/, "\\1$Self->{SessionCheckRemoteIP} = 0")
 
   line
 end
@@ -130,12 +132,13 @@ Dir.glob("/opt/otrs/var/cron/*.dist") do |distname|
 end
 
 ssl_certificate site do
-  domains site
+  domains [site] + site_aliases
   notifies :reload, "service[apache2]"
 end
 
 apache_site site do
   template "apache.erb"
+  variables :aliases => site_aliases
 end
 
 template "/etc/sudoers.d/otrs" do