Moving logrotate directory setup from jobs.sls and config.sls to init.sls. Closes #8

9 years ago · c335f5edbc
parent dc491d6545
commit c335f5edbc
3 changed files with 11 additions and 20 deletions
--- a/logrotate/config.sls
+++ b/logrotate/config.sls
@ -3,16 +3,6 @@
 include:
  - logrotate

-logrotate_directory:
-  file.directory:
-    - name: {{ logrotate.include_dir }}
-    - user: {{ salt['pillar.get']('logrotate:config:user', logrotate.user) }} 
-    - group: {{ salt['pillar.get']('logrotate:config:group', logrotate.group) }} 
-    - mode: 755
-    - makedirs: True
-    - require:
-      - pkg: logrotate
-
 logrotate_config:
  file.managed:
    - name: {{ logrotate.conf_file }}
--- a/logrotate/init.sls
+++ b/logrotate/init.sls
@ -7,3 +7,14 @@ logrotate:
    - name: {{ logrotate.service }}
    - enable: True
    - reload: True
+
+logrotate_directory:
+  file.directory:
+    - name: {{ logrotate.include_dir }}
+    - user: {{ salt['pillar.get']('logrotate:config:user', logrotate.user) }} 
+    - group: {{ salt['pillar.get']('logrotate:config:group', logrotate.group) }} 
+    - mode: 755
+    - makedirs: True
+    - require:
+      - pkg: logrotate
+
--- a/logrotate/jobs.sls
+++ b/logrotate/jobs.sls
@ -5,16 +5,6 @@
 include:
  - logrotate

-logrotate_directory:
-  file.directory:
-    - name: {{ logrotate.include_dir }}
-    - user: {{ salt['pillar.get']('logrotate:config:user', logrotate.user) }} 
-    - group: {{ salt['pillar.get']('logrotate:config:group', logrotate.group) }} 
-    - mode: 755
-    - makedirs: True
-    - require:
-      - pkg: logrotate
-
 {% for key,value in jobs.iteritems() %}
 {{key}}:
  file.managed: