X-Git-Url: https://git.openstreetmap.org/chef.git/blobdiff_plain/a68415b8f2bf106b6ea5948b0605c897b516ef4f..643f28e4f32f013c16d04378d7d1f3dd7d8edc17:/cookbooks/otrs/recipes/default.rb

diff --git a/cookbooks/otrs/recipes/default.rb b/cookbooks/otrs/recipes/default.rb
index e57609da7..b6861d1a2 100644
--- a/cookbooks/otrs/recipes/default.rb
+++ b/cookbooks/otrs/recipes/default.rb
@@ -47,6 +47,16 @@ 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"
   not_if { File.exist?("/opt/otrs-#{version}") }
@@ -110,18 +120,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"
@@ -141,6 +139,11 @@ Dir.glob("/opt/otrs/var/cron/*.dist") do |distname|
   end
 end
 
+ssl_certificate site do
+  domains site
+  notifies :reload, "service[apache2]"
+end
+
 apache_site site do
   template "apache.erb"
 end