Merge pull request #16 from jeroen92/master

Add option to let the module (not) manage the master.cf

pillar.example

@@ -1,4 +1,6 @@
 postfix:
+  manage_master_config: True
+  config:
     smtpd_banner: $myhostname ESMTP $mail_name
     biff: 'no'
 

postfix/config.sls

@@ -20,7 +20,7 @@ include:
     - watch_in:
       - service: postfix
     - template: jinja
-
+{% if salt['pillar.get']('postfix:manage_master_config', True) %}
 /etc/postfix/master.cf:
   file.managed:
     - source: salt://postfix/files/master.cf
@@ -32,4 +32,4 @@ include:
     - watch_in:
       - service: postfix
     - template: jinja
-
+{% endif %}

postfix/files/main.cf

@@ -1,4 +1,4 @@
-{% set config = salt['pillar.get']('postfix', {}) -%}
+{% set config = salt['pillar.get']('postfix:config', {}) -%}
 {% set processed_parameters = ['aliases', 'virtual'] -%}
 {% macro set_parameter(parameter, default=None) -%}
 {% set value = config.get(parameter, default) -%}