Merge pull request #39 from danoe/service_enable

allow postfix/postgrey services to be enabled or disabled
2016-05-19 11:27:37 -07:00 · 2016-05-19 11:27:37 -07:00 · 253f8d3698
commit 253f8d3698
parent 99d7f9b6fd 88fb050109
3 changed files with 5 additions and 2 deletions
--- 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
@ -18,6 +20,7 @@ postfix:

  postgrey:
    enabled: True
+    enable_service: True
    location: inet:172.16.0.5:6379

  policyd-spf:
--- 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:
--- 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: