add support for file owner,group,mode
diff --git a/README.rst b/README.rst
index ec2e2ca..e022360 100644
--- a/README.rst
+++ b/README.rst
@@ -27,6 +27,10 @@
format:
name: TraditionalFormatWithPRI
template: '"%syslogpriority% %syslogfacility% %timestamp:::date-rfc3339% %HOSTNAME% %syslogtag%%msg:::sp-if-no-1st-sp%%msg:::drop-last-lf%\n"'
+ file:
+ owner: root
+ group: root
+ createmode: 640
Read more
diff --git a/rsyslog/common.sls b/rsyslog/common.sls
index 2399735..c463aa9 100644
--- a/rsyslog/common.sls
+++ b/rsyslog/common.sls
@@ -6,12 +6,11 @@
pkg.latest:
- names: {{ server.pkgs }}
-/etc/rsyslog/rsyslog.conf:
+{{ server.configfile }}:
file.managed:
- - source: salt://rsyslog/files/rsyslog.conf
+ - source: salt://rsyslog/files/rsyslog.conf.{{ grains.os_family }}
- template: jinja
- mode: 640
- - group: rsyslog
- require:
- pkg: rsyslog_packages
@@ -20,7 +19,7 @@
- enable: true
- name: rsyslog
- watch:
- - file: /etc/rsyslog/rsyslog.conf
+ - file: {{ server.configfile }}
{%- endif %}
diff --git a/rsyslog/map.jinja b/rsyslog/map.jinja
index d36a63f..721567d 100644
--- a/rsyslog/map.jinja
+++ b/rsyslog/map.jinja
@@ -4,11 +4,13 @@
- rsyslog
service:
- rsyslogd
+ configfile: /etc/rsyslog/rsyslog.conf
RedHat:
pkgs:
- rsyslog
service:
- rsyslogd
+ configfile: /etc/rsyslog.conf
{%- endload %}
{%- set server = salt['grains.filter_by'](base_defaults, merge=salt['pillar.get']('rsyslog:server')) %}
{%- set client = salt['grains.filter_by'](base_defaults, merge=salt['pillar.get']('rsyslog:client')) %}
diff --git a/tests/pillar/client_single.sls b/tests/pillar/client_single.sls
index 5daa71b..8ee6045 100644
--- a/tests/pillar/client_single.sls
+++ b/tests/pillar/client_single.sls
@@ -4,4 +4,8 @@
format:
name: TraditionalFormatWithPRI
template: '"%syslogpriority% %syslogfacility% %timestamp:::date-rfc3339% %HOSTNAME% %syslogtag%%msg:::sp-if-no-1st-sp%%msg:::drop-last-lf%\n"'
+ file:
+ owner: root
+ group: root
+ createmode: 640