Configure DHCP for OOB on spike-{06,07,08}

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

diff --git a/cookbooks/otrs/recipes/default.rb b/cookbooks/otrs/recipes/default.rb
index 7b29d663141b8d663907c9fc3162d786c8313e92..ab7093ea98452f9d8790018e6838659c8edda6a5 100644 (file)
--- a/cookbooks/otrs/recipes/default.rb
+++ b/cookbooks/otrs/recipes/default.rb
@@ -36,6 +36,7 @@ package "libpdf-api2-perl"
 package "libsoap-lite-perl"
 package "libyaml-libyaml-perl"
 package "libcrypt-eksblowfish-perl"
 package "libsoap-lite-perl"
 package "libyaml-libyaml-perl"
 package "libcrypt-eksblowfish-perl"

+package "libtemplate-perl"

 
 apache_module "headers"
 
 
 apache_module "headers"
 


@@ -46,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]
 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
 
 postgresql_user database_user do
   cluster database_cluster


@@ -89,24 +91,13 @@ file "/opt/otrs-#{version}/Kernel/Config.pm" do
   content config
 end
 
   content config
 end
 

-generic_agent = edit_file "/opt/otrs-#{version}/Kernel/Config/GenericAgent.pm.dist" do |line|
-  line
-end
-
-file "/opt/otrs-#{version}/Kernel/Config/GenericAgent.pm" do
-  owner user
-  group "www-data"
-  mode 0o664
-  content generic_agent
-end
-

 link "/opt/otrs" do
   to "/opt/otrs-#{version}"
 end
 
 execute "/opt/otrs/bin/otrs.SetPermissions.pl" do
   action :run
 link "/opt/otrs" do
   to "/opt/otrs-#{version}"
 end
 
 execute "/opt/otrs/bin/otrs.SetPermissions.pl" do
   action :run

-  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}"
+  command "/opt/otrs/bin/otrs.SetPermissions.pl --otrs-user=#{user} --web-group=www-data /opt/otrs-#{version}"

   user "root"
   group "root"
   only_if { File.stat("/opt/otrs/README.md").uid != Etc.getpwnam("otrs").uid }
   user "root"
   group "root"
   only_if { File.stat("/opt/otrs/README.md").uid != Etc.getpwnam("otrs").uid }


@@ -140,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