otrs: use correct cluster port

diff --git a/cookbooks/otrs/recipes/debian.rb b/cookbooks/otrs/recipes/debian.rb
index 6e82a1933175a48b5cdc6d35836ddd5e1ec8a9af..fac61b6f8859a544c58f7d90b311b9da14ff388b 100644 (file)
--- a/cookbooks/otrs/recipes/debian.rb
+++ b/cookbooks/otrs/recipes/debian.rb
@@ -59,7 +59,8 @@ template "/etc/dbconfig-common/otrs2.conf" do
   mode "600"
   variables :database_name => database_name,
             :database_user => database_user,
   mode "600"
   variables :database_name => database_name,
             :database_user => database_user,

-            :database_password => database_password
+            :database_password => database_password,
+            :database_cluster => database_cluster

 end
 
 # Ensure the OTRS package in backports has a priority preference.
 end
 
 # Ensure the OTRS package in backports has a priority preference.

diff --git a/cookbooks/otrs/templates/default/dbconfig.config.erb b/cookbooks/otrs/templates/default/dbconfig.config.erb
index de55280e743c51b619e29ed67fe62ff26ad60565..b9ac13911f7abb528361e0e50a6ae83903dc6e36 100644 (file)
--- a/cookbooks/otrs/templates/default/dbconfig.config.erb
+++ b/cookbooks/otrs/templates/default/dbconfig.config.erb
@@ -45,7 +45,8 @@ dbc_dbserver='localhost'
 # dbc_dbport: remote database port
 #      leave unset to use the default.  only applicable if you are
 #      using a remote database.
 # dbc_dbport: remote database port
 #      leave unset to use the default.  only applicable if you are
 #      using a remote database.

-dbc_dbport=''
+# <%= @database_cluster %>
+dbc_dbport='<%= node[:postgresql][:clusters][@database_cluster][:port] %>'

 
 # dbc_dbname: name of database
 #      this is the name of your application's database.
 
 # dbc_dbname: name of database
 #      this is the name of your application's database.