dulcy: switch to postgresql 12

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

diff --git a/cookbooks/otrs/recipes/default.rb b/cookbooks/otrs/recipes/default.rb
index c71c920c61274167d4244bc05e5eb1e444a79058..b1a5a0107309c4c9dca97d51bd9c5ee5ec33c892 100644 (file)
--- a/cookbooks/otrs/recipes/default.rb
+++ b/cookbooks/otrs/recipes/default.rb
@@ -1,8 +1,8 @@
 #
 #

-# Cookbook Name:: otrs
+# Cookbook:: otrs

 # Recipe:: default
 #
 # Recipe:: default
 #

-# Copyright 2012, OpenStreetMap Foundation
+# Copyright:: 2012, OpenStreetMap Foundation

 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.


@@ -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]
 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


@@ -60,7 +61,7 @@ end
 
 remote_file "#{Chef::Config[:file_cache_path]}/otrs-#{version}.tar.bz2" do
   source "https://ftp.otrs.org/pub/otrs/otrs-#{version}.tar.bz2"
 
 remote_file "#{Chef::Config[:file_cache_path]}/otrs-#{version}.tar.bz2" do
   source "https://ftp.otrs.org/pub/otrs/otrs-#{version}.tar.bz2"

-  not_if { File.exist?("/opt/otrs-#{version}") }
+  not_if { ::File.exist?("/opt/otrs-#{version}") }

 end
 
 execute "untar-otrs-#{version}" do
 end
 
 execute "untar-otrs-#{version}" do


@@ -68,7 +69,7 @@ execute "untar-otrs-#{version}" do
   cwd "/opt"
   user "root"
   group "root"
   cwd "/opt"
   user "root"
   group "root"

-  not_if { File.exist?("/opt/otrs-#{version}") }
+  not_if { ::File.exist?("/opt/otrs-#{version}") }

 end
 
 config = edit_file "/opt/otrs-#{version}/Kernel/Config.pm.dist" do |line|
 end
 
 config = edit_file "/opt/otrs-#{version}/Kernel/Config.pm.dist" do |line|


@@ -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->{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
 
   line
 end


@@ -107,7 +109,7 @@ execute "/opt/otrs/bin/otrs.RebuildConfig.pl" do
   command "/opt/otrs/bin/otrs.RebuildConfig.pl"
   user "root"
   group "root"
   command "/opt/otrs/bin/otrs.RebuildConfig.pl"
   user "root"
   group "root"

-  not_if { File.exist?("/opt/otrs/Kernel/Config/Files/ZZZAAuto.pm") }
+  not_if { ::File.exist?("/opt/otrs/Kernel/Config/Files/ZZZAAuto.pm") }

 end
 
 execute "/opt/otrs/bin/Cron.sh" do
 end
 
 execute "/opt/otrs/bin/Cron.sh" do


@@ -130,12 +132,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