otrs: upgrade to latest znuny 6.0.x release

znuny only supports upgrading one minor version at a time.
Future upgrades will be 6.0.x -> 6.1.x -> 6.2.x etc

Signed-off-by: Grant Slater <github@firefishy.com>

diff --git a/cookbooks/otrs/attributes/default.rb b/cookbooks/otrs/attributes/default.rb
index 8a500003b27a1102e65b9fe52e5521830cfd9051..037cae612359ddf2f25598d1eaeb85e9c1939d07 100644 (file)
--- a/cookbooks/otrs/attributes/default.rb
+++ b/cookbooks/otrs/attributes/default.rb
@@ -1,4 +1,4 @@
-default[:otrs][:version] = "6.0.30"
+default[:otrs][:version] = "6.0.48"
 default[:otrs][:user] = "otrs"
 default[:otrs][:group] = nil
 default[:otrs][:database_cluster] = "15/main"

diff --git a/cookbooks/otrs/recipes/default.rb b/cookbooks/otrs/recipes/default.rb
index 0b391a62cc3479cede8e5b1bfcfe32d962e296eb..b557a7205c88effa2b15b37b1d87c81aff84bd50 100644 (file)
--- a/cookbooks/otrs/recipes/default.rb
+++ b/cookbooks/otrs/recipes/default.rb
@@ -67,20 +67,20 @@ postgresql_database database_name do
   owner database_user
 end
 
-remote_file "#{Chef::Config[:file_cache_path]}/otrs-#{version}.tar.bz2" do
-  source "https://download.znuny.org/releases/otrs-#{version}.tar.bz2"
-  not_if { ::File.exist?("/opt/otrs-#{version}") }
+remote_file "#{Chef::Config[:file_cache_path]}/znuny-#{version}.tar.bz2" do
+  source "https://download.znuny.org/releases/znuny-#{version}.tar.bz2"
+  not_if { ::File.exist?("/opt/znuny-#{version}") }
 end
 
-execute "untar-otrs-#{version}" do
-  command "tar jxf #{Chef::Config[:file_cache_path]}/otrs-#{version}.tar.bz2"
+execute "untar-znuny-#{version}" do
+  command "tar jxf #{Chef::Config[:file_cache_path]}/znuny-#{version}.tar.bz2"
   cwd "/opt"
   user "root"
   group "root"
-  not_if { ::File.exist?("/opt/otrs-#{version}") }
+  not_if { ::File.exist?("/opt/znuny-#{version}") }
 end
 
-config = edit_file "/opt/otrs-#{version}/Kernel/Config.pm.dist" do |line|
+config = edit_file "/opt/znuny-#{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}'")
@@ -93,7 +93,7 @@ config = edit_file "/opt/otrs-#{version}/Kernel/Config.pm.dist" do |line|
   line
 end
 
-file "/opt/otrs-#{version}/Kernel/Config.pm" do
+file "/opt/znuny-#{version}/Kernel/Config.pm" do
   owner user
   group "www-data"
   mode "664"
@@ -101,7 +101,7 @@ file "/opt/otrs-#{version}/Kernel/Config.pm" do
 end
 
 link "/opt/otrs" do
-  to "/opt/otrs-#{version}"
+  to "/opt/znuny-#{version}"
 end
 
 execute "/opt/otrs/bin/otrs.SetPermissions.pl" do
@@ -121,7 +121,7 @@ systemd_service "otrs" do
   private_tmp true
   protect_system "strict"
   protect_home true
-  read_write_paths ["/opt/otrs-#{version}/var", "/var/log/exim4", "/var/spool/exim4"]
+  read_write_paths ["/opt/znuny-#{version}/var", "/var/log/exim4", "/var/spool/exim4"]
 end
 
 service "otrs" do
@@ -139,11 +139,9 @@ apache_site site do
   variables :aliases => site_aliases
 end
 
-template "/etc/sudoers.d/otrs" do
-  source "sudoers.erb"
-  owner "root"
-  group "root"
-  mode "440"
+# FIXME: Remove old otrs sudoers file
+file "/etc/sudoers.d/otrs" do
+  action :delete
 end
 
 template "/etc/cron.daily/otrs-backup" do

diff --git a/cookbooks/otrs/templates/default/sudoers.erb b/cookbooks/otrs/templates/default/sudoers.erb
deleted file mode 100644 (file)
index 91c73e9..0000000
--- a/cookbooks/otrs/templates/default/sudoers.erb
+++ /dev/null
@@ -1,4 +0,0 @@
-# DO NOT EDIT - This file is being maintained by Chef
-
-# Allow exim to deliver mail into OTRS
-Debian-exim ALL=(otrs) NOPASSWD: /usr/share/otrs/bin/PostMaster.pl