From 42b40783693b084b870ced9253d00d433e9ddc07 Mon Sep 17 00:00:00 2001
From: Joshua Colson <joshua.colson@gmail.com>
Date: Wed, 23 May 2018 08:08:23 -0700
Subject: [PATCH] add ability to set network connection port for a remote
 relayhost

Signed-off-by: Joshua Colson <joshua.colson@gmail.com>
---
 README.md             | 1 +
 attributes/default.rb | 1 +
 recipes/client.rb     | 5 ++++-
 3 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 50a6a90..69d9171 100644
--- a/README.md
+++ b/README.md
@@ -34,6 +34,7 @@ See `attributes/default.rb` for default values.
 
 - `node['postfix']['mail_type']` - Sets the kind of mail configuration. `master` will set up a server (relayhost).
 - `node['postfix']['relayhost_role']` - name of a role used for search in the client recipe.
+- `node['postfix']['relayhost_port']` - listening network port of the relayhost.
 - `node['postfix']['multi_environment_relay']` - set to true if nodes should not constrain search for the relayhost in their own environment.
 - `node['postfix']['use_procmail']` - set to true if nodes should use procmail as the delivery agent.
 - `node['postfix']['use_alias_maps']` - set to true if you want the cookbook to use/configure alias maps
diff --git a/attributes/default.rb b/attributes/default.rb
index 16677b0..1a745f3 100644
--- a/attributes/default.rb
+++ b/attributes/default.rb
@@ -17,6 +17,7 @@
 # Generic cookbook attributes
 default['postfix']['mail_type'] = 'client'
 default['postfix']['relayhost_role'] = 'relayhost'
+default['postfix']['relayhost_port'] = '25'
 default['postfix']['multi_environment_relay'] = false
 default['postfix']['use_procmail'] = false
 default['postfix']['use_alias_maps'] = (node['platform'] == 'freebsd')
diff --git a/recipes/client.rb b/recipes/client.rb
index 2231ce2..571077a 100644
--- a/recipes/client.rb
+++ b/recipes/client.rb
@@ -24,6 +24,9 @@ end
 
 query = "role:#{node['postfix']['relayhost_role']}"
 relayhost = ''
+# if the relayhost_port attribute is not port 25, append to the relayhost
+relayhost_port = node['postfix']['relayhost_port'].to_s != '25' ? ":#{node['postfix']['relayhost_port']}" : ''
+
 # results = []
 
 if node.run_list.roles.include?(node['postfix']['relayhost_role'])
@@ -36,6 +39,6 @@ else
   relayhost = results.map { |n| n['ipaddress'] }.first
 end
 
-node.normal['postfix']['main']['relayhost'] = "[#{relayhost}]"
+node.normal['postfix']['main']['relayhost'] = "[#{relayhost}]#{relayhost_port}"
 
 include_recipe 'postfix'