From 7b5096f715fa9dc88dea5bc8fcc8452afd368fff Mon Sep 17 00:00:00 2001
From: Chase Bolt <cbolt@denirostaff.com>
Date: Wed, 20 Aug 2014 13:46:03 -0700
Subject: [PATCH] moving virtual domain usage into a
 use_virtual_aliases_domains block to mimic use_virtual_aliases

---
 attributes/default.rb              |  9 +++++++--
 recipes/virtual_aliases.rb         | 11 -----------
 recipes/virtual_aliases_domains.rb | 28 ++++++++++++++++++++++++++++
 3 files changed, 35 insertions(+), 13 deletions(-)
 create mode 100644 recipes/virtual_aliases_domains.rb

diff --git a/attributes/default.rb b/attributes/default.rb
index 81cf8ab..cf72996 100644
--- a/attributes/default.rb
+++ b/attributes/default.rb
@@ -24,10 +24,12 @@ default['postfix']['use_alias_maps'] = false
 default['postfix']['use_transport_maps'] = false
 default['postfix']['use_access_maps'] = false
 default['postfix']['use_virtual_aliases'] = false
+default['postfix']['use_virtual_aliases_domains'] = false
 default['postfix']['aliases'] = {}
 default['postfix']['transports'] = {}
 default['postfix']['access'] = {}
 default['postfix']['virtual_aliases'] = {}
+default['postfix']['virtual_aliases_domains'] = {}
 default['postfix']['main_template_source'] = 'postfix'
 default['postfix']['master_template_source'] = 'postfix'
 default['postfix']['sender_canonical_map_entries'] = {}
@@ -127,8 +129,11 @@ if node['postfix']['use_access_maps']
 end
 
 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_domains'] = ["#{node['postfix']['virtual_alias_domains_db_type']}:#{node['postfix']['virtual_alias_domains_db']}"] unless default['postfix']['virtual_aliases_domains'].nil?
+  default['postfix']['main']['virtual_alias_maps'] = ["#{node['postfix']['virtual_alias_db_type']}:#{node['postfix']['virtual_alias_db']}"]
+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
 
 # # Default main.cf attributes according to `postconf -d`
diff --git a/recipes/virtual_aliases.rb b/recipes/virtual_aliases.rb
index b3ddaf0..6997a30 100644
--- a/recipes/virtual_aliases.rb
+++ b/recipes/virtual_aliases.rb
@@ -22,18 +22,7 @@ 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/recipes/virtual_aliases_domains.rb b/recipes/virtual_aliases_domains.rb
new file mode 100644
index 0000000..c02efca
--- /dev/null
+++ b/recipes/virtual_aliases_domains.rb
@@ -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