adding the usage of virtual_domains along with other file types other than hash

This commit is contained in:
Chase Bolt 2014-08-13 18:10:00 -07:00
parent eb3fb66eed
commit 7fd9784867
3 changed files with 41 additions and 1 deletions

View File

@ -37,22 +37,40 @@ case node['platform']
when 'smartos' when 'smartos'
default['postfix']['conf_dir'] = '/opt/local/etc/postfix' default['postfix']['conf_dir'] = '/opt/local/etc/postfix'
default['postfix']['aliases_db'] = '/opt/local/etc/postfix/aliases' default['postfix']['aliases_db'] = '/opt/local/etc/postfix/aliases'
default['postfix']['aliases_db_type'] = 'hash'
default['postfix']['transport_db'] = '/opt/local/etc/postfix/transport' default['postfix']['transport_db'] = '/opt/local/etc/postfix/transport'
default['postfix']['transport_db_type'] = 'hash'
default['postfix']['access_db'] = '/opt/local/etc/postfix/access' default['postfix']['access_db'] = '/opt/local/etc/postfix/access'
default['postfix']['access_db_type'] = 'hash'
default['postfix']['virtual_alias_db'] = '/opt/local/etc/postfix/virtual' default['postfix']['virtual_alias_db'] = '/opt/local/etc/postfix/virtual'
default['postfix']['virtual_alias_db_type'] = 'hash'
default['postfix']['virtual_alias_domains_db'] = '/opt/local/etc/postfix/virtual_domains'
default['postfix']['virtual_alias_domains_db_type'] = 'hash'
when 'omnios' when 'omnios'
default['postfix']['conf_dir'] = '/opt/omni/etc/postfix' default['postfix']['conf_dir'] = '/opt/omni/etc/postfix'
default['postfix']['aliases_db'] = 'opt/omni/etc/postfix/aliases' default['postfix']['aliases_db'] = 'opt/omni/etc/postfix/aliases'
default['postfix']['aliases_db_type'] = 'hash'
default['postfix']['transport_db'] = '/opt/omni/etc/postfix/transport' default['postfix']['transport_db'] = '/opt/omni/etc/postfix/transport'
default['postfix']['transport_db_type'] = 'hash'
default['postfix']['access_db'] = '/opt/omni/etc/postfix/access' default['postfix']['access_db'] = '/opt/omni/etc/postfix/access'
default['postfix']['access_db_type'] = 'hash'
default['postfix']['virtual_alias_db'] = '/etc/omni/etc/postfix/virtual' default['postfix']['virtual_alias_db'] = '/etc/omni/etc/postfix/virtual'
default['postfix']['virtual_alias_db_type'] = 'hash'
default['postfix']['virtual_alias_domains_db'] = '/etc/omni/etc/postfix/virtual_domains'
default['postfix']['virtual_alias_domains_db_type'] = 'hash'
default['postfix']['uid'] = 11 default['postfix']['uid'] = 11
else else
default['postfix']['conf_dir'] = '/etc/postfix' default['postfix']['conf_dir'] = '/etc/postfix'
default['postfix']['aliases_db'] = '/etc/aliases' default['postfix']['aliases_db'] = '/etc/aliases'
default['postfix']['aliases_db_type'] = 'hash'
default['postfix']['transport_db'] = '/etc/postfix/transport' default['postfix']['transport_db'] = '/etc/postfix/transport'
default['postfix']['transport_db_type'] = 'hash'
default['postfix']['access_db'] = '/etc/postfix/access' default['postfix']['access_db'] = '/etc/postfix/access'
default['postfix']['access_db_type'] = 'hash'
default['postfix']['virtual_alias_db'] = '/etc/postfix/virtual' default['postfix']['virtual_alias_db'] = '/etc/postfix/virtual'
default['postfix']['virtual_alias_db_type'] = 'hash'
default['postfix']['virtual_alias_domains_db'] = '/etc/postfix/virtual_domains'
default['postfix']['virtual_alias_domains_db_type'] = 'hash'
end end
# Non-default main.cf attributes # Non-default main.cf attributes
@ -119,7 +137,8 @@ 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'] = ["hash:#{node['postfix']['virtual_alias_db']}"] 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']}"]
end end
# # Default main.cf attributes according to `postconf -d` # # Default main.cf attributes according to `postconf -d`

View File

@ -22,7 +22,18 @@ 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

View File

@ -0,0 +1,10 @@
#
# This file is generated by Chef for <%= node['fqdn'] %>
#
# Local changes will be overwritten
#
# See man 5 virtual for format
<% node['postfix']['virtual_aliases_domains'].each do |key, value| %>
<%= key %> <%= value %>
<% end unless node['postfix']['virtual_aliases_domains'].nil? %>