From f6a07d5d99bf596abbf32277d0d2aa4a5a291922 Mon Sep 17 00:00:00 2001 From: "Alessio Cassibba (x-drum)" Date: Wed, 15 Mar 2017 16:56:11 +0100 Subject: [PATCH] Fix some defaults: rsyslog_priv_drop_to_user, rsyslog_priv_drop_to_group rsyslog_action_file_template --- README.md | 3 +++ defaults/main.yml | 6 +++--- templates/rsyslog.conf.j2 | 8 ++++---- 3 files changed, 10 insertions(+), 7 deletions(-) diff --git a/README.md b/README.md index ebf1a6a..c929969 100644 --- a/README.md +++ b/README.md @@ -33,6 +33,9 @@ and configuration can be overridden, for additional informations please have a l **purge_config**: Purge existing config snippets (default: "False") **use_repo**: Use Adiscon rsyslog official package repository (default: "False") **repo_releasever**: Default rsyslog major release repository version to use (default: 8) +**rsyslog_action_file_template**: Define a custom template for file logging (default: RSYSLOG_TraditionalFileFormat) +**rsyslog_priv_drop_to_user**: Drop root privileges and switch to given user (default: root) +**rsyslog_priv_drop_to_group**: Drop root privileges and switch to given group (default: root) Additional Role Variables: -------------- diff --git a/defaults/main.yml b/defaults/main.yml index 13ddca0..940495f 100644 --- a/defaults/main.yml +++ b/defaults/main.yml @@ -8,9 +8,9 @@ rsyslog_umask: "0022" rsyslog_abort_on_unclean_config: "off" rsyslog_repeated_msg_reduction: "off" rsyslog_action_file_default_template: RSYSLOG_TraditionalFileFormat -#rsyslog_action_file_template: "%rawmsg%\n" -#rsyslog_priv_drop_to_user: syslog -#rsyslog_priv_drop_to_group: syslog +rsyslog_action_file_template: False ## example value: "%rawmsg%\n" +rsyslog_priv_drop_to_user: False ## example value: syslog +rsyslog_priv_drop_to_group: False ## example value: syslog purge_config: False use_repo: False repo_releasever: 8 diff --git a/templates/rsyslog.conf.j2 b/templates/rsyslog.conf.j2 index 721af9d..dbee4de 100644 --- a/templates/rsyslog.conf.j2 +++ b/templates/rsyslog.conf.j2 @@ -4,7 +4,7 @@ $ModLoad immark.so $ModLoad imuxsock.so $ModLoad imklog.so -{% if rsyslog_action_file_template is defined %} +{% if rsyslog_action_file_template %} $ActionFileDefaultTemplate myFormat $template myFormat,{{ rsyslog_action_file_template }} {% else %} @@ -18,11 +18,11 @@ $FileOwner {{ rsyslog_file_owner }} $FileGroup {{ rsyslog_file_group }} $FileCreateMode {{ rsyslog_file_create_mode }} $Umask {{ rsyslog_umask }} -{% if rsyslog_priv_drop_to_user is defined %} +{% if rsyslog_priv_drop_to_user %} $PrivDropToUser {{ rsyslog_priv_drop_to_user }} {% endif %} -{% if rsyslog_priv_drop_to_group is defined %} -$PrivDropToGroup {{ rsyslog_priv_drop_to_group }} +{% if rsyslog_priv_drop_to_group %} +$PrivDropToGroup {{ rsyslog_priv_drop_to_group }} {% endif %} {% if rsyslog_server is defined %}