kosmos/postfix-cookbook
8
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

moving virtual domain usage into a use_virtual_aliases_domains block to mimic use_virtual_aliases

Browse Source
This commit is contained in:
Chase Bolt 2014-08-20 13:46:03 -07:00
parent 3b4b521a2a
commit 7b5096f715
3 changed files with 35 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
attributes/default.rb
View File

@ -24,10 +24,12 @@ default['postfix']['use_alias_maps'] = false
default['postfix']['use_transport_maps'] = false default['postfix']['use_transport_maps'] = false
default['postfix']['use_access_maps'] = false default['postfix']['use_access_maps'] = false
default['postfix']['use_virtual_aliases'] = false default['postfix']['use_virtual_aliases'] = false
default['postfix']['use_virtual_aliases_domains'] = false
default['postfix']['aliases'] = {} default['postfix']['aliases'] = {}
default['postfix']['transports'] = {} default['postfix']['transports'] = {}
default['postfix']['access'] = {} default['postfix']['access'] = {}
default['postfix']['virtual_aliases'] = {} default['postfix']['virtual_aliases'] = {}
default['postfix']['virtual_aliases_domains'] = {}
default['postfix']['main_template_source'] = 'postfix' default['postfix']['main_template_source'] = 'postfix'
default['postfix']['master_template_source'] = 'postfix' default['postfix']['master_template_source'] = 'postfix'
default['postfix']['sender_canonical_map_entries'] = {} default['postfix']['sender_canonical_map_entries'] = {}
@ -127,8 +129,11 @@ if node['postfix']['use_access_maps']
end end
if node['postfix']['use_virtual_aliases'] if node['postfix']['use_virtual_aliases']
default['postfix']['main']['virtual_alias_maps'] = ["#{node['postfix']['virtual_alias_db_type']}:#{node['postfix']['virtual_alias_db']}"] unless default['postfix']['virtual_aliases'].nil? default['postfix']['main']['virtual_alias_maps'] = ["#{node['postfix']['virtual_alias_db_type']}:#{node['postfix']['virtual_alias_db']}"]
default['postfix']['main']['virtual_alias_domains'] = ["#{node['postfix']['virtual_alias_domains_db_type']}:#{node['postfix']['virtual_alias_domains_db']}"] unless default['postfix']['virtual_aliases_domains'].nil? end
if node['postfix']['use_virtual_aliases_domains']
default['postfix']['main']['virtual_alias_domains'] = ["#{node['postfix']['virtual_alias_domains_db_type']}:#{node['postfix']['virtual_alias_domains_db']}"]
end end
# # Default main.cf attributes according to `postconf -d` # # Default main.cf attributes according to `postconf -d`

11
recipes/virtual_aliases.rb
View File

@ -22,18 +22,7 @@ execute 'update-postfix-virtual-alias' do
action :nothing action :nothing
end end
execute 'update-postfix-virtual-alias-domains' do
command "postmap #{node['postfix']['virtual_alias_domains_db']}"
environment PATH: "#{ENV['PATH']}:/opt/omni/bin:/opt/omni/sbin" if platform_family?('omnios')
action :nothing
end
template node['postfix']['virtual_alias_db'] do template node['postfix']['virtual_alias_db'] do
source 'virtual_aliases.erb' source 'virtual_aliases.erb'
notifies :run, 'execute[update-postfix-virtual-alias]' notifies :run, 'execute[update-postfix-virtual-alias]'
end end
template node['postfix']['virtual_alias_domains_db'] do
source 'virtual_aliases_domains.erb'
notifies :run, 'execute[update-postfix-virtual-alias-domains]'
end

28
recipes/virtual_aliases_domains.rb Normal file
View File

@ -0,0 +1,28 @@
# encoding: utf-8
# Copyright:: Copyright (c) 2012, Opscode, Inc.
#
# Licensed under the Apache License, Version 2.0 (the "License");
# 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
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
#
include_recipe 'postfix::_common'
execute 'update-postfix-virtual-alias-domains' do
command "postmap #{node['postfix']['virtual_alias_domains_db']}"
environment PATH: "#{ENV['PATH']}:/opt/omni/bin:/opt/omni/sbin" if platform_family?('omnios')
action :nothing
end
template node['postfix']['virtual_alias_domains_db'] do
source 'virtual_aliases_domains.erb'
notifies :run, 'execute[update-postfix-virtual-alias-domains]'
end