Browse Source

rsyslog: Rename catch-all log config to so it's lexicographically after everything else.

Signed-off-by: Maximilian Wilhelm <max@rfc2324.org>
Maximilian Wilhelm 6 years ago
parent
commit
baecbc23fe
2 changed files with 9 additions and 4 deletions
  1. 9 4
      rsyslog/init.sls
  2. 0 0
      rsyslog/zz-debug.conf

+ 9 - 4
rsyslog/init.sls

@@ -12,10 +12,15 @@ rsyslog:
 
 
 /etc/rsyslog-early.d:
-  file.directory:
+  file.recurse:
+    - source: salt://rsyslog/rsyslog-early.d
     - user: root
     - group: root
-    - mode: 0755
+    - file_mode: 644
+    - dir_mode: 755
+    - clean: true
+    - watch_in:
+      - service: rsyslog
 
 
 /etc/rsyslog.conf:
@@ -58,9 +63,9 @@ rsyslog:
 
 
 {% if 'logserver' in roles %}
-/etc/rsyslog.d/99-debug.conf:
+/etc/rsyslog.d/zz-debug.conf:
   file.managed:
-    - source: salt://rsyslog/99-debug.conf
+    - source: salt://rsyslog/zz-debug.conf
     - watch_in:
       - service: rsyslog
 {% endif %}

+ 0 - 0
rsyslog/99-debug.conf → rsyslog/zz-debug.conf