From 44c775e059d58581312d7b9504d4c9418f265afe Mon Sep 17 00:00:00 2001 From: Chase Bolt Date: Thu, 14 Aug 2014 09:28:45 -0700 Subject: [PATCH] moving db_type to be set in the generic attributes --- attributes/default.rb | 20 +++++--------------- 1 file changed, 5 insertions(+), 15 deletions(-) diff --git a/attributes/default.rb b/attributes/default.rb index 07ca134..52b42d2 100644 --- a/attributes/default.rb +++ b/attributes/default.rb @@ -32,45 +32,35 @@ default['postfix']['main_template_source'] = 'postfix' default['postfix']['master_template_source'] = 'postfix' default['postfix']['sender_canonical_map_entries'] = {} default['postfix']['smtp_generic_map_entries'] = {} +default['postfix']['access_db_type'] = 'hash' +default['postfix']['aliases_db_type'] = 'hash' +default['postfix']['transport_db_type'] = 'hash' +default['postfix']['virtual_alias_db_type'] = 'hash' +default['postfix']['virtual_alias_domains_db_type'] = 'hash' 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