Convert more URLs to https

[chef.git] / cookbooks / otrs / recipes / default.rb

diff --git a/cookbooks/otrs/recipes/default.rb b/cookbooks/otrs/recipes/default.rb
index e57609da7621215ca057507fb99320203824f679..7b29d663141b8d663907c9fc3162d786c8313e92 100644 (file)
--- 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")
 
@@ -47,8 +47,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
 
@@ -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