From ac7b5e1a8d4b35ede37089d7310f789608c3b74f Mon Sep 17 00:00:00 2001 From: Daniel Oetken Date: Wed, 18 May 2016 19:29:37 +0200 Subject: [PATCH 1/2] option to make postfix service enabled or disabled --- pillar.example | 2 ++ postfix/init.sls | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/pillar.example b/pillar.example index 5663fcf..28f3d57 100644 --- a/pillar.example +++ b/pillar.example @@ -3,6 +3,8 @@ postfix: master_config: enable_submission: False + enable_service: True + virtual: groupaliasexample: - someuser_1@example.com diff --git a/postfix/init.sls b/postfix/init.sls index 167f8fb..66e0dd6 100644 --- a/postfix/init.sls +++ b/postfix/init.sls @@ -6,7 +6,7 @@ postfix: - watch_in: - service: postfix service.running: - - enable: True + - enable: {{ salt['pillar.get']('postfix:enable_service', True) }} - require: - pkg: postfix - watch: From 88fb050109124f22177214f821f2909a7430630f Mon Sep 17 00:00:00 2001 From: Daniel Oetken Date: Thu, 19 May 2016 13:55:15 +0200 Subject: [PATCH 2/2] option to make postgrey service enabled or disabled --- pillar.example | 1 + postfix/postgrey.sls | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/pillar.example b/pillar.example index 28f3d57..7976469 100644 --- a/pillar.example +++ b/pillar.example @@ -20,6 +20,7 @@ postfix: postgrey: enabled: True + enable_service: True location: inet:172.16.0.5:6379 policyd-spf: diff --git a/postfix/postgrey.sls b/postfix/postgrey.sls index e12482c..b819aa9 100644 --- a/postfix/postgrey.sls +++ b/postfix/postgrey.sls @@ -7,7 +7,7 @@ postgrey: - service: postgrey service.running: - - enable: True + - enable: {{ salt['pillar.get']('postfix:postgrey:enable_service', True) }} - require: - pkg: postgrey - watch: