From 81c97bdc63aa15792f50942d6b51df5727455490 Mon Sep 17 00:00:00 2001
From: david <david@davidkarlsen.com>
Date: Wed, 4 Feb 2015 12:16:36 +0100
Subject: [PATCH 1/2] fix todo and use similar pattern as for the rest of the
 parameters

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

diff --git a/postfix/files/main.cf b/postfix/files/main.cf
index 4c9867b..d863b78 100644
--- a/postfix/files/main.cf
+++ b/postfix/files/main.cf
@@ -46,14 +46,12 @@
 {{ set_parameter('mailbox_size_limit', '0') }}
 {{ set_parameter('recipient_delimiter', '+') }}
 {{ set_parameter('inet_interfaces', 'all') }}
+{{ set_parameter('message_size_limit', '41943040') }}
 
 {% if 'virtual' in pillar.get('postfix','') %}
 virtual_alias_maps = hash:/etc/postfix/virtual
 {% endif %}
 
-#TODO: move into a pillar
-message_size_limit = 41943040
-
 {# Accept arbitrary parameters -#}
 {% for parameter in config -%}
 {% if parameter not in processed_parameters -%}

From 2faeb5ea5f882ac37d25ca13af5c083fec7a23fe Mon Sep 17 00:00:00 2001
From: david <david@davidkarlsen.com>
Date: Wed, 4 Feb 2015 13:07:35 +0100
Subject: [PATCH 2/2] should accept localhost as well as localhost.localdomain

---
 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 d863b78..8968c14 100644
--- a/postfix/files/main.cf
+++ b/postfix/files/main.cf
@@ -40,7 +40,7 @@
 {{ set_parameter('myhostname', grains['fqdn']) }}
 {{ set_parameter('alias_maps', 'hash:/etc/aliases') }}
 {{ set_parameter('alias_database', 'hash:/etc/aliases') }}
-{{ set_parameter('mydestination', grains['fqdn'] + ', localhost.localdomain, ' + grains['domain'] ) }}
+{{ 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') }}
 {{ set_parameter('mailbox_size_limit', '0') }}