From 7fd978486764824847af8816ffa8a1d0ad56012f Mon Sep 17 00:00:00 2001
From: Chase Bolt <cbolt@denirostaff.com>
Date: Wed, 13 Aug 2014 18:10:00 -0700
Subject: [PATCH] adding the usage of virtual_domains along with other file
 types other than hash

---
 attributes/default.rb                         | 21 ++++++++++++++++++-
 recipes/virtual_aliases.rb                    | 11 ++++++++++
 templates/default/virtual_aliases_domains.erb | 10 +++++++++
 3 files changed, 41 insertions(+), 1 deletion(-)
 create mode 100644 templates/default/virtual_aliases_domains.erb

diff --git a/attributes/default.rb b/attributes/default.rb
index 1dcaebb..07ca134 100644
--- a/attributes/default.rb
+++ b/attributes/default.rb
@@ -37,22 +37,40 @@ case node['platform']
 when 'smartos'
   default['postfix']['conf_dir'] = '/opt/local/etc/postfix'
   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_type'] = 'hash'
   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_type'] = 'hash'
+  default['postfix']['virtual_alias_domains_db'] = '/opt/local/etc/postfix/virtual_domains'
+  default['postfix']['virtual_alias_domains_db_type'] = 'hash'
 when 'omnios'
   default['postfix']['conf_dir'] = '/opt/omni/etc/postfix'
   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_type'] = 'hash'
   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_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
 else
   default['postfix']['conf_dir'] = '/etc/postfix'
   default['postfix']['aliases_db'] = '/etc/aliases'
+  default['postfix']['aliases_db_type'] = 'hash'
   default['postfix']['transport_db'] = '/etc/postfix/transport'
+  default['postfix']['transport_db_type'] = 'hash'
   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_type'] = 'hash'
+  default['postfix']['virtual_alias_domains_db'] = '/etc/postfix/virtual_domains'
+  default['postfix']['virtual_alias_domains_db_type'] = 'hash'
 end
 
 # Non-default main.cf attributes
@@ -119,7 +137,8 @@ if node['postfix']['use_access_maps']
 end
 
 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
 
 # # Default main.cf attributes according to `postconf -d`
diff --git a/recipes/virtual_aliases.rb b/recipes/virtual_aliases.rb
index 6997a30..b3ddaf0 100644
--- a/recipes/virtual_aliases.rb
+++ b/recipes/virtual_aliases.rb
@@ -22,7 +22,18 @@ execute 'update-postfix-virtual-alias' do
   action :nothing
 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
   source 'virtual_aliases.erb'
   notifies :run, 'execute[update-postfix-virtual-alias]'
 end
+
+template node['postfix']['virtual_alias_domains_db'] do
+  source 'virtual_aliases_domains.erb'
+  notifies :run, 'execute[update-postfix-virtual-alias-domains]'
+end
diff --git a/templates/default/virtual_aliases_domains.erb b/templates/default/virtual_aliases_domains.erb
new file mode 100644
index 0000000..a02a35a
--- /dev/null
+++ b/templates/default/virtual_aliases_domains.erb
@@ -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? %>