knot-dns: checkout the zones repository as the knot user

knot-dns/init.sls

@@ -5,9 +5,7 @@ include:
   - ferm
 
 knot:
-  pkg.installed:
-    - pkgs:
-      - knot
+  pkg.installed: []
   service.running:
     - name: knot
     - enable: True
@@ -15,6 +13,7 @@ knot:
     - watch:
       - pkg: knot
       - file: /etc/knot/knot.conf
+      - git: /var/lib/knot/zones
 
 /etc/knot/knot.conf:
   file.managed:
@@ -26,34 +25,15 @@ knot:
     - require:
       - pkg: knot
 
-/var/lib/knot/:
-  file.directory:
-    - user: knot
-    - group: knot
-    - order: last
-    - recurse:
-      - user
-      - group
-    - require:
-      - pkg: knot
-
-/var/lib/knot/zones/:
+/var/lib/knot/zones:
   git.latest:
     - name: {{ knot['repository']['remote'] }}
     - branch: {{ knot['repository']['branch'] }}
-    - target: /var/lib/knot/zones/
-    - watch_in:
-      - service: knot
+    - target: /var/lib/knot/zones
+    - user: knot
     - require:
       - pkg: git
       - pkg: knot
-  file.directory:
-    - makedirs: True
-    - user: knot
-    - group: knot
-    - recurse:
-      - user
-      - group
 
 /etc/ferm/conf.d/40-knot.conf:
   file.managed: