dev
diff --git a/rsyslog/common.sls b/rsyslog/common.sls
index 79a8eba..e597163 100644
--- a/rsyslog/common.sls
+++ b/rsyslog/common.sls
@@ -23,16 +23,6 @@
- clean: true
{% endif %}
-{#
-/etc/rsyslog.d/50-default.conf:
- file.managed:
- - source: salt://rsyslog/files/default.conf
- - template: jinja
- - mode: 0640
- - require:
- - file: /etc/rsyslog.conf
-#}
-
rsyslog_service:
service.running:
- enable: true
diff --git a/rsyslog/files/rsyslog.default.conf b/rsyslog/files/rsyslog.default.conf
index c5f7320..4aef7e7 100644
--- a/rsyslog/files/rsyslog.default.conf
+++ b/rsyslog/files/rsyslog.default.conf
@@ -1,4 +1,4 @@
-{%- from "rsyslog/map.jinja" import client,server,common with context -%}
+{%- from "rsyslog/map.jinja" import common with context -%}
{% if common.preserve_fqdn is defined and common.preserve_fqdn == true %}
$PreserveFQDN
@@ -39,6 +39,14 @@
$IncludeConfig {{ common.rsyslog_d }}/*.conf
+{% if common.format is defined %}{% if common.format is defined %}
+$template {{ common.format.name }},{{ common.format.template }}
+$ActionFileDefaultTemplate {{ common.format.name }}
+{% else %}
+$template RSYSLOG_TraditionalFileFormat
+$ActionFileDefaultTemplate RSYSLOG_TraditionalFileFormat
+{% endif %}
+
{%- for name,config in common.output.file.iteritems() %}
{% if config.owner is defined %}
$FileOwner: {{ config['owner'] }}
diff --git a/rsyslog/map.jinja b/rsyslog/map.jinja
index 8ce756f..c6b90e1 100644
--- a/rsyslog/map.jinja
+++ b/rsyslog/map.jinja
@@ -136,6 +136,4 @@
createmode: "0600"
enable: true
{%- 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')) %}
-{%- set common = salt['grains.filter_by'](base_defaults, merge=salt['pillar.get']('rsyslog:client')) %}
+{%- set common = salt['grains.filter_by'](base_defaults, merge=salt['pillar.get']('rsyslog:common')) %}