From ad8d4b89dc1f20d8bb02abcfbd2e98e2d0395317 Mon Sep 17 00:00:00 2001
From: Heinz Wiesinger <heinz@m2mobi.com>
Date: Mon, 21 Sep 2020 11:18:20 +0200
Subject: [PATCH] refactor(service): split out nfs service handling into
 dedicated state

---
 nfs/server.sls  | 15 ++++++---------
 nfs/service.sls | 11 +++++++++++
 2 files changed, 17 insertions(+), 9 deletions(-)
 create mode 100644 nfs/service.sls

diff --git a/nfs/server.sls b/nfs/server.sls
index d45a170..9d8943b 100644
--- a/nfs/server.sls
+++ b/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) -%}
diff --git a/nfs/service.sls b/nfs/service.sls
new file mode 100644
index 0000000..72960fd
--- /dev/null
+++ b/nfs/service.sls
@@ -0,0 +1,11 @@
+{% from "nfs/map.jinja" import nfs with context %}
+
+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
+