Merge pull request #16 from jeroen92/master
Add option to let the module (not) manage the master.cf
This commit is contained in:
commit
037470d46b
@ -1,4 +1,6 @@
|
|||||||
postfix:
|
postfix:
|
||||||
|
manage_master_config: True
|
||||||
|
config:
|
||||||
smtpd_banner: $myhostname ESMTP $mail_name
|
smtpd_banner: $myhostname ESMTP $mail_name
|
||||||
biff: 'no'
|
biff: 'no'
|
||||||
|
|
||||||
|
@ -20,7 +20,7 @@ include:
|
|||||||
- watch_in:
|
- watch_in:
|
||||||
- service: postfix
|
- service: postfix
|
||||||
- template: jinja
|
- template: jinja
|
||||||
|
{% if salt['pillar.get']('postfix:manage_master_config', True) %}
|
||||||
/etc/postfix/master.cf:
|
/etc/postfix/master.cf:
|
||||||
file.managed:
|
file.managed:
|
||||||
- source: salt://postfix/files/master.cf
|
- source: salt://postfix/files/master.cf
|
||||||
@ -32,4 +32,4 @@ include:
|
|||||||
- watch_in:
|
- watch_in:
|
||||||
- service: postfix
|
- service: postfix
|
||||||
- template: jinja
|
- template: jinja
|
||||||
|
{% endif %}
|
||||||
|
@ -1,4 +1,4 @@
|
|||||||
{% set config = salt['pillar.get']('postfix', {}) -%}
|
{% set config = salt['pillar.get']('postfix:config', {}) -%}
|
||||||
{% set processed_parameters = ['aliases', 'virtual'] -%}
|
{% set processed_parameters = ['aliases', 'virtual'] -%}
|
||||||
{% macro set_parameter(parameter, default=None) -%}
|
{% macro set_parameter(parameter, default=None) -%}
|
||||||
{% set value = config.get(parameter, default) -%}
|
{% set value = config.get(parameter, default) -%}
|
||||||
|
Loading…
Reference in New Issue
Block a user