Update postfix cookbook

This commit is contained in:
Râu Cao
2023-11-29 22:26:29 +01:00
parent 1e9878d17e
commit 158a9c2fbe
43 changed files with 836 additions and 156 deletions

View File

@@ -2,7 +2,7 @@
# Cookbook:: postfix
# Recipe:: client
#
# Copyright:: 2009-2017, Chef Software, Inc.
# Copyright:: 2009-2019, Chef Software, Inc.
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@ -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.default['postfix']['main']['relayhost'] = "[#{relayhost}]#{relayhost_port}"
include_recipe 'postfix'