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 e57609da7621215ca057507fb99320203824f679..b1a5a0107309c4c9dca97d51bd9c5ee5ec33c892 100644 (file)
--- a/cookbooks/otrs/recipes/default.rb
+++ b/cookbooks/otrs/recipes/default.rb
@@ -1,14 +1,14 @@
 #
 #

-# 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.
 # You may obtain a copy of the License at
 #
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # 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,
 #
 # 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 "tools"
 include_recipe "postgresql"

-include_recipe "apache::ssl"
+include_recipe "apache"

 
 passwords = data_bag_item("otrs", "passwords")
 
 
 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 "libsoap-lite-perl"
 package "libyaml-libyaml-perl"
 package "libcrypt-eksblowfish-perl"

+package "libtemplate-perl"

 
 apache_module "headers"
 
 
 apache_module "headers"
 


@@ -46,10 +47,21 @@ 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
+  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
 
 remote_file "#{Chef::Config[:file_cache_path]}/otrs-#{version}.tar.bz2" do

-  source "http://ftp.otrs.org/pub/otrs/otrs-#{version}.tar.bz2"
-  not_if { File.exist?("/opt/otrs-#{version}") }
+  source "https://ftp.otrs.org/pub/otrs/otrs-#{version}.tar.bz2"
+  not_if { ::File.exist?("/opt/otrs-#{version}") }

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


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


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


@@ -79,24 +92,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 }


@@ -107,19 +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") }
-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
+  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


@@ -141,8 +131,14 @@ Dir.glob("/opt/otrs/var/cron/*.dist") do |distname|
   end
 end
 
   end
 end
 

+ssl_certificate site do
+  domains [site] + site_aliases
+  notifies :reload, "service[apache2]"
+end
+

 apache_site site do
   template "apache.erb"
 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