Merge pull request #37 from M2mobi/service

Allow disabling of NFS services

nfs/server.sls

@@ -1,9 +1,15 @@
 {% from "nfs/map.jinja" import nfs with context %}
 
+include:
+  - nfs.service
+
+
 {% if nfs.pkgs_server %}
 nfs-server-deps:
     pkg.installed:
         - pkgs: {{ nfs.pkgs_server|json }}
+        - require_in:
+          - service: nfs-service
 {% endif %}
 
 nfs-exports-configure:
@@ -14,15 +20,6 @@ nfs-exports-configure:
     - watch_in:
       - service: nfs-service
 
-nfs-service:
-  service.running:
-{% if nfs.service_name is string %}
-    - name: {{ nfs.service_name }}
-{% elif nfs.service_name is iterable %}
-    - names: {{ nfs.service_name }}
-{% endif %}
-    - enable: True
-
 {% if grains.get('os') == 'FreeBSD' %}
   {% set mountd_flags = salt['pillar.get'](
         'nfs:server:mountd_flags', None) -%}

nfs/service.sls

@@ -0,0 +1,15 @@
+{% from "nfs/map.jinja" import nfs with context %}
+
+nfs-service:
+{% if nfs.enabled %}
+  service.running:
+    - enable: True
+{% else %}
+  service.dead:
+    - enable: False
+{% endif %}
+{% if nfs.service_name is string %}
+    - name: {{ nfs.service_name }}
+{% elif nfs.service_name is iterable %}
+    - names: {{ nfs.service_name }}
+{% endif %}

pillar.example

@@ -5,6 +5,7 @@ nfs:
   mount_opts: noauto,ro
   persist_unmount: true
   persist_mount: false
+  enabled: true
 
   # Server settings
   server: