updated salt_minion state

2021-05-29 08:59:03 +02:00 · 2021-05-29 08:59:03 +02:00 · a0db077281
commit a0db077281
parent 355fc27259
3 changed files with 28 additions and 23 deletions
--- a/states/salt_minion/config.sls
+++ b/states/salt_minion/config.sls
@ -0,0 +1,10 @@
+---
+{%- from "salt_minion/map.jinja" import salt_minion with context %}
+salt-minion-config:
+  file.managed:
+    - name: /etc/salt/minion
+    - source: salt://salt_minion/minion.j2
+    - template: jinja
+    - user: root
+    - group: root
+    - mode: 640
--- a/states/salt_minion/init.sls
+++ b/states/salt_minion/init.sls
@ -1,24 +1,4 @@
 ---
-{%- from "salt_minion/map.jinja" import salt_minion with context %}
-salt-minion-config:
-  file.managed:
-    - name: /etc/salt/minion
-    - source: salt://salt_minion/minion.j2
-    - template: jinja
-    - user: root
-    - group: root
-    - mode: 640
-
-salt-minion-service-file:
-  file.managed:
-    - name: /etc/systemd/system/salt-minion.service
-    - source: salt://salt_minion/salt-minion.service.j2
-    - template: jinja
-    - user: root
-    - group: root
-    - mode: 644
-
-salt-minion-service:
-  service.running:
-    - name: salt-minion
-    - enable: True
+include:
+  - .config
+  - .service
--- a/states/salt_minion/service.sls
+++ b/states/salt_minion/service.sls
@ -0,0 +1,15 @@
+---
+{%- from "salt_minion/map.jinja" import salt_minion with context %}
+salt-minion-service-file:
+  file.managed:
+    - name: /etc/systemd/system/salt-minion.service
+    - source: salt://salt_minion/salt-minion.service.j2
+    - template: jinja
+    - user: root
+    - group: root
+    - mode: 644
+
+salt-minion-service:
+  service.running:
+    - name: salt-minion
+    - enable: True