Track osm-carto schema_change branch with osmbot

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

diff --git a/cookbooks/otrs/recipes/default.rb b/cookbooks/otrs/recipes/default.rb
index 77ac3912d8fd08e82dadaad59bbe95a3739b1b3b..ab7093ea98452f9d8790018e6838659c8edda6a5 100644 (file)
--- a/cookbooks/otrs/recipes/default.rb
+++ b/cookbooks/otrs/recipes/default.rb
@@ -47,12 +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]
 database_user = node[:otrs][:database_user]
 database_password = passwords[node[:otrs][:database_password]]
 site = node[:otrs][:site]

-
-old_installation = begin
-                     File.readlink("/opt/otrs")
-                   rescue StandardError
-                     nil
-                   end
+site_aliases = node[:otrs][:site_aliases] || []

 
 postgresql_user database_user do
   cluster database_cluster
 
 postgresql_user database_user do
   cluster database_cluster


@@ -96,16 +91,6 @@ file "/opt/otrs-#{version}/Kernel/Config.pm" do
   content config
 end
 
   content config
 end
 

-link "/opt/otrs-#{version}/Kernel/Config/Files/ZZZAuto.pm" do
-  to "#{old_installation}/Kernel/Config/Files/ZZZAuto.pm"
-  link_type :hard
-end
-
-link "/opt/otrs-#{version}/var/log/TicketCounter.log" do
-  to "#{old_installation}/var/log/TicketCounter.log"
-  link_type :hard
-end
-

 link "/opt/otrs" do
   to "/opt/otrs-#{version}"
 end
 link "/opt/otrs" do
   to "/opt/otrs-#{version}"
 end


@@ -146,12 +131,13 @@ Dir.glob("/opt/otrs/var/cron/*.dist") do |distname|
 end
 
 ssl_certificate site do
 end
 
 ssl_certificate site do

-  domains site
+  domains [site] + site_aliases

   notifies :reload, "service[apache2]"
 end
 
 apache_site site do
   template "apache.erb"
   notifies :reload, "service[apache2]"
 end
 
 apache_site site do
   template "apache.erb"

+  variables :aliases => site_aliases

 end
 
 template "/etc/sudoers.d/otrs" do
 end
 
 template "/etc/sudoers.d/otrs" do