Merge changes from topics 'per-output-file', 'stop-processing'
* changes:
Add syslog template per output file
Add option to skip the log_collector configuration
Add stop processing option
diff --git a/rsyslog/map.jinja b/rsyslog/map.jinja
index a322661..7078ebc 100644
--- a/rsyslog/map.jinja
+++ b/rsyslog/map.jinja
@@ -106,44 +106,49 @@
sync: true
filter: "*.info;mail.none;authpriv.none;cron.none"
owner: root
- group: root
- createmode: "0600"
- umask: "0000"
+ group: adm
+ createmode: "0640"
+ umask: "0022"
enabled: true
/var/log/secure:
sync: true
filter: "authpriv.*"
owner: root
- group: root
- createmode: "0600"
+ group: adm
+ createmode: "0640"
+ umask: "0022"
enabled: true
/var/log/maillog:
sync: true
filter: "mail.*"
owner: root
- group: root
- createmode: "0600"
+ group: adm
+ createmode: "0640"
+ umask: "0022"
enabled: true
/var/log/cron:
sync: true
filter: "cron.*"
owner: root
- group: root
- createmode: "0600"
+ group: adm
+ createmode: "0640"
+ umask: "0022"
enabled: true
/var/log/spooler:
sync: true
filter: "uucp,news.crit"
owner: root
- group: root
- createmode: "0600"
+ group: adm
+ createmode: "0640"
+ umask: "0022"
enabled: true
/var/log/boot.log:
sync: false
filter: "local7.*"
owner: root
- group: root
- createmode: "0600"
+ group: adm
+ createmode: "0640"
+ umask: "0022"
enabled: true
{%- endload %}
{%- set global = salt['grains.filter_by'](base_defaults, merge=salt['pillar.get']('rsyslog:client')) %}