From ca7cb13ae91201b0242e13e396fc365808d08fd5 Mon Sep 17 00:00:00 2001
From: Dominik Schleich <dominik.schleich@braintec-group.com>
Date: Thu, 27 Aug 2015 16:11:22 +0200
Subject: [PATCH 1/3] changed the default aliases variable name to match the
 one checked in init.sls

---
 postfix/map.jinja | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/postfix/map.jinja b/postfix/map.jinja
index c884024..49bf76a 100644
--- a/postfix/map.jinja
+++ b/postfix/map.jinja
@@ -4,27 +4,27 @@
         'policyd_spf_pkg': 'postfix-policyd-spf-python',
         'postgrey_pkg': 'postgrey',
         'service': 'postfix',
-        'aliases': '/etc/aliases',
+        'aliases_file': '/etc/aliases',
     },
     'Gentoo': {
         'package': 'mail-mta/postfix',
         'policyd_spf_pkg': 'mail-filter/pypolicyd-spf',
         'postgrey_pkg': 'mail-filter/postgrey',
         'service': 'postfix',
-        'aliases': '/etc/mail/aliases',
+        'aliases_file': '/etc/mail/aliases',
     },
     'RedHat': {
         'package': 'postfix',
         'policyd_spf_pkg': 'pypolicyd-spf',
         'postgrey_pkg': 'postgrey',
         'service': 'postfix',
-        'aliases': '/etc/aliases',
+        'aliases_file': '/etc/aliases',
     },
     'Arch' : {
         'package': 'postfix',
         'policyd_spf_pkg': 'python-postfix-policyd-spf',
         'postgrey_pkg': 'postgrey',
         'service': 'postfix',
-        'aliases': '/etc/aliases',
+        'aliases_file': '/etc/aliases',
     },
 }, merge=salt['pillar.get']('postfix:lookup')) %}

From 04f365170dee822a217a8daf3b8c5fbc9a082e43 Mon Sep 17 00:00:00 2001
From: Dominik Schleich <dominik.schleich@braintec-group.com>
Date: Thu, 27 Aug 2015 16:14:57 +0200
Subject: [PATCH 2/3] changed the default aliases variable name to match the
 one checked in init.sls this times also in the template

---
 postfix/files/main.cf | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/postfix/files/main.cf b/postfix/files/main.cf
index 0776953..3a28124 100644
--- a/postfix/files/main.cf
+++ b/postfix/files/main.cf
@@ -48,8 +48,8 @@
 # information on enabling SSL in the smtp client.
 
 {{ set_parameter('myhostname', grains['fqdn']) }}
-{{ set_parameter('alias_maps', 'hash:' ~ postfix.aliases) }}
-{{ set_parameter('alias_database', 'hash:' ~ postfix.aliases) }}
+{{ set_parameter('alias_maps', 'hash:' ~ postfix.aliases_file) }}
+{{ set_parameter('alias_database', 'hash:' ~ postfix.aliases_file) }}
 {{ set_parameter('mydestination', [grains['fqdn'], 'localhost', 'localhost.localdomain', grains['domain']]) }}
 {{ set_parameter('relayhost', '') }}
 {{ set_parameter('mynetworks', ['127.0.0.0/8', '[::ffff:127.0.0.0]/104', '[::1]/128']) }}

From ae7ada3bb812d6cccf7d405b06f5acec927e6bec Mon Sep 17 00:00:00 2001
From: Dominik Schleich <dominik.schleich@braintec-group.com>
Date: Thu, 27 Aug 2015 16:16:54 +0200
Subject: [PATCH 3/3] changed the default aliases variable name to match the
 one checked in init.sls / one overseen use

---
 postfix/files/main.cf | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/postfix/files/main.cf b/postfix/files/main.cf
index 3a28124..cc488ee 100644
--- a/postfix/files/main.cf
+++ b/postfix/files/main.cf
@@ -1,7 +1,7 @@
 {% from "postfix/map.jinja" import postfix with context %}
 
 {% set config = salt['pillar.get']('postfix:config', {}) -%}
-{% set processed_parameters = ['aliases', 'virtual'] -%}
+{% set processed_parameters = ['aliases_file', 'virtual'] -%}
 {% macro set_parameter(parameter, default=None) -%}
 {% set value = config.get(parameter, default) -%}
 {% if value is not none -%}