Merge "Templatize rsyslog configuration files"

This commit is contained in:
Zuul 2019-03-27 02:20:11 +00:00 committed by Gerrit Code Review
commit fa8a61f9b2
6 changed files with 36 additions and 6 deletions

View File

@ -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"

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -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