X-Git-Url: https://git.openstreetmap.org/chef.git/blobdiff_plain/ea0715b4be41a1d1600bba7a1f5d0b988708579f..91946d5d67dc302bb147f0640cb5614416945891:/cookbooks/otrs/recipes/default.rb?ds=sidebyside

diff --git a/cookbooks/otrs/recipes/default.rb b/cookbooks/otrs/recipes/default.rb
index 18b0c2ea6..c71c920c6 100644
--- a/cookbooks/otrs/recipes/default.rb
+++ b/cookbooks/otrs/recipes/default.rb
@@ -8,7 +8,7 @@
 # you may not use this file except in compliance with the License.
 # You may obtain a copy of the License at
 #
-#     http://www.apache.org/licenses/LICENSE-2.0
+#     https://www.apache.org/licenses/LICENSE-2.0
 #
 # Unless required by applicable law or agreed to in writing, software
 # distributed under the License is distributed on an "AS IS" BASIS,
@@ -19,7 +19,7 @@
 
 include_recipe "tools"
 include_recipe "postgresql"
-include_recipe "apache::ssl"
+include_recipe "apache"
 
 passwords = data_bag_item("otrs", "passwords")
 
@@ -36,6 +36,7 @@ package "libpdf-api2-perl"
 package "libsoap-lite-perl"
 package "libyaml-libyaml-perl"
 package "libcrypt-eksblowfish-perl"
+package "libtemplate-perl"
 
 apache_module "headers"
 
@@ -47,8 +48,18 @@ database_user = node[:otrs][:database_user]
 database_password = passwords[node[:otrs][:database_password]]
 site = node[:otrs][:site]
 
+postgresql_user database_user do
+  cluster database_cluster
+  password database_password
+end
+
+postgresql_database database_name do
+  cluster database_cluster
+  owner database_user
+end
+
 remote_file "#{Chef::Config[:file_cache_path]}/otrs-#{version}.tar.bz2" do
-  source "http://ftp.otrs.org/pub/otrs/otrs-#{version}.tar.bz2"
+  source "https://ftp.otrs.org/pub/otrs/otrs-#{version}.tar.bz2"
   not_if { File.exist?("/opt/otrs-#{version}") }
 end
 
@@ -67,6 +78,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
@@ -74,27 +86,20 @@ end
 file "/opt/otrs-#{version}/Kernel/Config.pm" do
   owner user
   group "www-data"
-  mode 0664
+  mode 0o664
   content config
 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")
-end
-
 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"
-  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
@@ -105,18 +110,6 @@ execute "/opt/otrs/bin/otrs.RebuildConfig.pl" do
   not_if { File.exist?("/opt/otrs/Kernel/Config/Files/ZZZAAuto.pm") }
 end
 
-if node[:postgresql][:clusters][database_cluster]
-  postgresql_user database_user do
-    cluster database_cluster
-    password database_password
-  end
-
-  postgresql_database database_name do
-    cluster database_cluster
-    owner database_user
-  end
-end
-
 execute "/opt/otrs/bin/Cron.sh" do
   action :nothing
   command "/opt/otrs/bin/Cron.sh restart"
@@ -130,12 +123,17 @@ Dir.glob("/opt/otrs/var/cron/*.dist") do |distname|
   file name do
     owner "otrs"
     group "www-data"
-    mode 0664
+    mode 0o664
     content IO.read(distname)
     notifies :run, "execute[/opt/otrs/bin/Cron.sh]"
   end
 end
 
+ssl_certificate site do
+  domains site
+  notifies :reload, "service[apache2]"
+end
+
 apache_site site do
   template "apache.erb"
 end
@@ -144,12 +142,12 @@ template "/etc/sudoers.d/otrs" do
   source "sudoers.erb"
   owner "root"
   group "root"
-  mode 0440
+  mode 0o440
 end
 
 template "/etc/cron.daily/otrs-backup" do
   source "backup.cron.erb"
   owner "root"
   group "root"
-  mode 0755
+  mode 0o755
 end