From b2fc0f1c0bb827fdfdb07f7fc3cfa6173f8c274c Mon Sep 17 00:00:00 2001 From: Gilles Dartiguelongue Date: Thu, 29 Dec 2016 11:51:09 +0100 Subject: [PATCH] Add support for default_database_type configuration option See github issue #50. --- postfix/init.sls | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/postfix/init.sls b/postfix/init.sls index 931dc03..cd28d94 100644 --- a/postfix/init.sls +++ b/postfix/init.sls @@ -12,6 +12,9 @@ postfix: - watch: - pkg: postfix +{# Used for newaliases, postalias and postconf #} +{%- set default_database_type = salt['pillar.get']('postfix:config:default_database_type', 'hash') %} + # manage /etc/aliases if data found in pillar {% if 'aliases' in pillar.get('postfix', '') %} {{ postfix.aliases_file }}: @@ -38,9 +41,11 @@ run-newaliases: {%- set file_path = salt['pillar.get']('postfix:config:' ~ mapping) %} {%- if ':' in file_path %} {%- set file_type, file_path = file_path.split(':') %} - {%- if file_type in ("btree", "cdb", "dbm", "hash", "sdbm") %} - {%- set need_postmap = True %} - {%- endif %} + {%- else %} + {%- set file_type = default_database_type %} + {%- endif %} + {%- if file_type in ("btree", "cdb", "dbm", "hash", "sdbm") %} + {%- set need_postmap = True %} {%- endif %} postfix_{{ mapping }}: file.managed: