combine states

restic/init.sls

@@ -11,7 +11,7 @@ restic-{{ client }}:
 'download restic':
   cmd.script:
     - shell: /bin/bash
-    - source: salt://restic/files/install.sh.jinja
+    - source: 'salt://restic/files/install.sh'
     - templates: jinja
     - unless: "/bin/restic version | grep 'restic 0.16.2 '"
     - env:
@@ -33,42 +33,35 @@ restic-{{ client }}:
             create 600 root root
         }
 
-/opt/restic:
+restic dirs:
   file.directory:
     - user: root
     - group: root
     - mode: 700
+    - names:
+      - /opt/restic: []
+      - /var/log/restic: []
 
-/opt/restic/env.sh:
+restic scripts:
   file.managed:
-    - source: 'salt://restic/files/env.sh.jinja'
     - template: jinja
     - user: root
     - group: root
     - mode: 700
+    - names:
+      - /opt/restic/env.sh:
+        - source: 'salt://restic/files/env.sh'
+      - /opt/restic/backup.sh:
+        - source: 'salt://restic/files/backup.sh'
     - require:
       - file: /opt/restic
 
-/opt/restic/backup.sh:
+restic cron:
-  file.managed:
-    - source: 'salt://restic/files/backup.sh.jinja'
-    - template: jinja
-    - user: root
-    - group: root
-    - mode: 700
-    - require:
-      - file: /opt/restic
-"/opt/restic/backup.sh 2>&1 >/dev/null":
   cron.present:
+    - name: "/opt/restic/backup.sh 2>&1 >/dev/null"
     - identifier: restic backup
     - minute: random
     - hour: 4
     - dayweek: 0
 
-/var/log/restic:
-  file.directory:
-    - user: root
-    - group: root
-    - mode: 700
-
 {% endif %}