diff --git a/tasks/rsyslog_client_post_install.yml b/tasks/rsyslog_client_post_install.yml index e5e145c..3fddad7 100644 --- a/tasks/rsyslog_client_post_install.yml +++ b/tasks/rsyslog_client_post_install.yml @@ -14,7 +14,7 @@ # limitations under the License. - name: Rsyslog Setup - copy: + template: src: "50-default.conf" dest: "/etc/rsyslog.d/50-default.conf" owner: "root" diff --git a/files/50-default.conf b/templates/50-default.conf similarity index 81% rename from files/50-default.conf rename to templates/50-default.conf index 30f37ed..2dee8f6 100644 --- a/files/50-default.conf +++ b/templates/50-default.conf @@ -1,5 +1,5 @@ auth,authpriv.* /var/log/auth.log -*.*;local7,auth,authpriv,cron,daemon,mail,news.none -/var/log/syslog +*.*;local7,auth,authpriv,cron,daemon,mail,news.none -{{ rsyslog_system_logfile }} cron.* /var/log/cron.log daemon.* -/var/log/daemon.log kern.* -/var/log/kern.log diff --git a/templates/rsyslog.conf.j2 b/templates/rsyslog.conf.j2 index 88e8a61..f42a93e 100644 --- a/templates/rsyslog.conf.j2 +++ b/templates/rsyslog.conf.j2 @@ -24,13 +24,13 @@ $RepeatedMsgReduction on # # Set the default permissions for all log files. # -$FileOwner syslog -$FileGroup adm +$FileOwner {{ rsyslog_logfile_user }} +$FileGroup {{ rsyslog_logfile_group }} $FileCreateMode 0640 $DirCreateMode 0755 $Umask 0022 -$PrivDropToUser syslog -$PrivDropToGroup syslog +$PrivDropToUser {{ rsyslog_logfile_drop_user }} +$PrivDropToGroup {{ rsyslog_logfile_drop_group }} # # Where to place spool and state files diff --git a/vars/debian.yml b/vars/debian.yml index 23ae6a5..1bacf53 100644 --- a/vars/debian.yml +++ b/vars/debian.yml @@ -26,3 +26,13 @@ rsyslog_client_already_handled_files: - /var/log/auth.log rsyslog_client_reload: 'systemctl restart rsyslog > /dev/null 2>&1 || true' + +rsyslog_system_logfile: /var/log/syslog + +rsyslog_logfile_user: syslog + +rsyslog_logfile_group: adm + +rsyslog_logfile_drop_user: syslog + +rsyslog_logfile_drop_group: syslog diff --git a/vars/redhat-7.yml b/vars/redhat-7.yml index e563358..546477a 100644 --- a/vars/redhat-7.yml +++ b/vars/redhat-7.yml @@ -20,3 +20,13 @@ rsyslog_client_distro_packages: rsyslog_client_reload: 'systemctl restart rsyslog 2>&1 || true' rsyslog_client_already_handled_files: [] + +rsyslog_system_logfile: /var/log/messages + +rsyslog_logfile_user: root + +rsyslog_logfile_group: root + +rsyslog_logfile_drop_user: root + +rsyslog_logfile_drop_group: root diff --git a/vars/suse.yml b/vars/suse.yml index 90df292..afd5c42 100644 --- a/vars/suse.yml +++ b/vars/suse.yml @@ -23,3 +23,13 @@ rsyslog_client_distro_packages_remove: rsyslog_client_already_handled_files: [] rsyslog_client_reload: 'systemctl -q restart rsyslogd || true' + +rsyslog_system_logfile: /var/log/messages + +rsyslog_logfile_user: root + +rsyslog_logfile_group: root + +rsyslog_logfile_drop_user: root + +rsyslog_logfile_drop_group: root