From f514881e5a2edfee927cee015c2331a3566bbe0d Mon Sep 17 00:00:00 2001
From: Florian Ermisch <florian.ermisch@mailbox.org>
Date: Thu, 24 Aug 2017 13:35:24 +0200
Subject: [PATCH] explain the difference between alias_maps and alias_database

---
 pillar.example        | 3 +++
 postfix/files/main.cf | 3 ++-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/pillar.example b/pillar.example
index bb09c3a..6199c41 100644
--- a/pillar.example
+++ b/pillar.example
@@ -36,6 +36,9 @@ postfix:
 
     # Alias
     alias_maps: hash:/etc/aliases
+    # This is the list of files for the newaliases
+    # cmd to process (see postconf(5) for details).
+    # Only local hash/btree/dbm files:
     alias_database: hash:/etc/aliases
 
     # Virtual users
diff --git a/postfix/files/main.cf b/postfix/files/main.cf
index 57cab2b..f775745 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', {}) -%}
+{#- TODO: alias_maps probably belongs here, too: #}
 {%- set processed_parameters = [
-        'aliases_file',
         'virtual_alias_maps',
         'smtp_sasl_password_maps',
         'sender_canonical_maps',
@@ -74,6 +74,7 @@
 {%- endif %}
 
 {{ set_parameter('myhostname', grains['fqdn']) }}
+{#- TODO: The following two may not be the same: #}
 {{ 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']]) }}