X-Git-Url: https://git.openstreetmap.org./chef.git/blobdiff_plain/ea0715b4be41a1d1600bba7a1f5d0b988708579f..35f220a555dee107786152d3daff4d66d1655e56:/cookbooks/otrs/recipes/default.rb

diff --git a/cookbooks/otrs/recipes/default.rb b/cookbooks/otrs/recipes/default.rb
index 18b0c2ea6..0b810f428 100644
--- a/cookbooks/otrs/recipes/default.rb
+++ b/cookbooks/otrs/recipes/default.rb
@@ -67,6 +67,7 @@ config = edit_file "/opt/otrs-#{version}/Kernel/Config.pm.dist" do |line|
   line.gsub!(/^( *)\$Self->{Database} = 'otrs'/, "\\1$Self->{Database} = '#{database_name}'")
   line.gsub!(/^( *\$Self->{DatabaseDSN} = "DBI:mysql:)/, "#\\1")
   line.gsub!(/^#( *\$Self->{DatabaseDSN} = "DBI:Pg:.*;host=)/, "\\1")
+  line.gsub!(/^( *)# (\$Self->{CheckMXRecord} = 0)/, "\\1\\2")
 
   line
 end
@@ -78,11 +79,15 @@ file "/opt/otrs-#{version}/Kernel/Config.pm" do
   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 0664
-  content IO.read("/opt/otrs-#{version}/Kernel/Config/GenericAgent.pm.dist")
+  content generic_agent
 end
 
 link "/opt/otrs" do
@@ -94,7 +99,7 @@ execute "/opt/otrs/bin/otrs.SetPermissions.pl" do
   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}"
   user "root"
   group "root"
-  not_if { File.stat("/opt/otrs/README.md").uid != Etc.getpwnam("otrs").uid }
+  only_if { File.stat("/opt/otrs/README.md").uid != Etc.getpwnam("otrs").uid }
 end
 
 execute "/opt/otrs/bin/otrs.RebuildConfig.pl" do