From 4dde22c1c2c23bc316f7b78743aaceabc840db94 Mon Sep 17 00:00:00 2001 From: Gardais Jeremy Date: Tue, 30 Jan 2018 17:08:52 +0100 Subject: [PATCH] Move default Rsyslog configuration to multiple files. --- scripts/latecommand/stretch/etc/rsyslog.conf | 50 ---------------- .../stretch/etc/rsyslog.d/00-global.conf | 9 +++ .../etc/rsyslog.d/05-common-defaults.conf | 22 +++++++ .../etc/rsyslog.d/10-local-modules.conf | 19 ++++++ .../etc/rsyslog.d/50-default-rulesets.conf | 45 ++++++++++++++ .../stretch/etc/rsyslog.d/99syslog.conf | 60 ------------------- 6 files changed, 95 insertions(+), 110 deletions(-) create mode 100644 scripts/latecommand/stretch/etc/rsyslog.d/00-global.conf create mode 100644 scripts/latecommand/stretch/etc/rsyslog.d/05-common-defaults.conf create mode 100644 scripts/latecommand/stretch/etc/rsyslog.d/10-local-modules.conf create mode 100644 scripts/latecommand/stretch/etc/rsyslog.d/50-default-rulesets.conf delete mode 100644 scripts/latecommand/stretch/etc/rsyslog.d/99syslog.conf diff --git a/scripts/latecommand/stretch/etc/rsyslog.conf b/scripts/latecommand/stretch/etc/rsyslog.conf index e43579b..31b426b 100644 --- a/scripts/latecommand/stretch/etc/rsyslog.conf +++ b/scripts/latecommand/stretch/etc/rsyslog.conf @@ -1,55 +1,5 @@ -# /etc/rsyslog.conf Configuration file for rsyslog. -# More information http://wiki.rsyslog.com/index.php/ -# -# For more information see -# /usr/share/doc/rsyslog-doc/html/rsyslog_conf.html - - -################# -#### MODULES #### -################# - -module(load="imuxsock") # provides support for local system logging -module(load="imklog") # provides kernel logging support -#module(load="immark") # provides --MARK-- message capability - -# provides UDP syslog reception -#module(load="imudp") -#input(type="imudp" port="514") - -# provides TCP syslog reception -#module(load="imtcp") -#input(type="imtcp" port="514") - -########################### -#### GLOBAL DIRECTIVES #### -########################### -# -# Use traditional timestamp format. -# To enable high precision timestamps, comment out the following line. -# -$ActionFileDefaultTemplate RSYSLOG_TraditionalFileFormat - -# -# Set the default permissions for all log files. -# -$FileOwner root -$FileGroup adm -$FileCreateMode 0640 -$DirCreateMode 0755 -$Umask 0022 - -# -# Where to place spool and state files -# -$WorkDirectory /var/spool/rsyslog - # # Include all config files in /etc/rsyslog.d/ # $IncludeConfig /etc/rsyslog.d/*.conf -############### -#### RULES #### -############### -# See /etc/rsyslog.d/99syslog.conf diff --git a/scripts/latecommand/stretch/etc/rsyslog.d/00-global.conf b/scripts/latecommand/stretch/etc/rsyslog.d/00-global.conf new file mode 100644 index 0000000..37ccc49 --- /dev/null +++ b/scripts/latecommand/stretch/etc/rsyslog.d/00-global.conf @@ -0,0 +1,9 @@ +# This file is managed remotely, all changes will be lost + +# +# Global options +# +global( + defaultNetstreamDriver="ptcp" +) + diff --git a/scripts/latecommand/stretch/etc/rsyslog.d/05-common-defaults.conf b/scripts/latecommand/stretch/etc/rsyslog.d/05-common-defaults.conf new file mode 100644 index 0000000..7e81e59 --- /dev/null +++ b/scripts/latecommand/stretch/etc/rsyslog.d/05-common-defaults.conf @@ -0,0 +1,22 @@ +# This file is managed remotely, all changes will be lost + +# +# Set default permissions for all log files +# +$FileOwner root +$FileGroup adm +$FileCreateMode 0640 +$DirCreateMode 0755 +$Umask 0022 + + +# +# Where to place spool and state files +# +$WorkDirectory /var/spool/rsyslog + +# +# Log every message +# +$RepeatedMsgReduction off + diff --git a/scripts/latecommand/stretch/etc/rsyslog.d/10-local-modules.conf b/scripts/latecommand/stretch/etc/rsyslog.d/10-local-modules.conf new file mode 100644 index 0000000..960625d --- /dev/null +++ b/scripts/latecommand/stretch/etc/rsyslog.d/10-local-modules.conf @@ -0,0 +1,19 @@ +# This file is managed remotely, all changes will be lost + +# +# Log messages sent to local UNIX socket +# +$ModLoad imuxsock + +# +# Log kernel messages +# +$ModLoad imklog +$KLogPermitNonKernelFacility on + +# +# Log periodic -- MARK -- messages +# +$ModLoad immark +$MarkMessagePeriod 3600 + diff --git a/scripts/latecommand/stretch/etc/rsyslog.d/50-default-rulesets.conf b/scripts/latecommand/stretch/etc/rsyslog.d/50-default-rulesets.conf new file mode 100644 index 0000000..33926dd --- /dev/null +++ b/scripts/latecommand/stretch/etc/rsyslog.d/50-default-rulesets.conf @@ -0,0 +1,45 @@ +# This file is managed remotely, all changes will be lost + +# +# Standard log files, split by facility +# +auth,authpriv.* /var/log/auth.log +*.*;cron,auth,authpriv.none -/var/log/syslog +cron.* -/var/log/cron.log +daemon.* -/var/log/daemon.log +kern.* -/var/log/kern.log +lpr.* -/var/log/lpr.log +mail.* -/var/log/mail.log +user.* -/var/log/user.log + +# +# Logging for the mail system. Split it up so that +# it is easy to write scripts to parse these files +# +mail.info -/var/log/mail.info +mail.warn -/var/log/mail.warn +mail.err /var/log/mail.err + +# +# Logging for INN news system +# +news.crit /var/log/news/news.crit +news.err /var/log/news/news.err +news.notice -/var/log/news/news.notice + +# +# Some "catch-all" log files +# +*.=debug;\ + auth,authpriv.none;\ + mail,news.none -/var/log/debug +*.=info;*.=notice;*.=warn;\ + auth,authpriv.none;\ + cron,daemon.none;\ + mail,news.none -/var/log/messages + +# +# Emergencies are sent to everybody logged in +# +*.emerg :omusrmsg:* + diff --git a/scripts/latecommand/stretch/etc/rsyslog.d/99syslog.conf b/scripts/latecommand/stretch/etc/rsyslog.d/99syslog.conf deleted file mode 100644 index a2394eb..0000000 --- a/scripts/latecommand/stretch/etc/rsyslog.d/99syslog.conf +++ /dev/null @@ -1,60 +0,0 @@ -# Default rules for rsyslog. -# -# For more information see rsyslog.conf(5) and /etc/rsyslog.conf -#---------------------------------------------------------------------------- -# Fichier de configuration du daemon syslogd -#---------------------------------------------------------------------------- - -# -# First some standard log files. Log by facility. -# -auth.* /var/log/auth.log -authpriv.* /var/log/authpriv.log -*.*;auth,authpriv.none -/var/log/syslog -cron.* /var/log/cron.log -mark.* /var/log/cron/mark.log -daemon.* -/var/log/daemon.log -kern.* -/var/log/kern.log -lpr.* -/var/log/lpr.log -mail.* -/var/log/mail.log -user.* -/var/log/user.log - -# -# Logging for the mail system. Split it up so that -# it is easy to write scripts to parse these files. -# -mail.info -/var/log/mail.info -mail.warn -/var/log/mail.warn -mail.err /var/log/mail.err - -# -# Additional log may be used occasionally -# -news.* /var/log/news.log -uucp.* /var/log/uucp.log -local0.* /var/log/local0.log -local1.* /var/log/local1.log -local2.* /var/log/local2.log -local3.* /var/log/local3.log -local4.* /var/log/local4.log -local5.* /var/log/local5.log -local6.* /var/log/local6.log -local7.* /var/log/local7.log - -# -# Some "catch-all" log files. -# -*.=debug;\ - auth,authpriv.none;\ - news.none;mail.none -/var/log/debug - -# All logs. -*.=info;*.=notice;*.=warn;\ - auth,authpriv.none;\ - cron,daemon.none;\ - mail,news.none -/var/log/messages - -# -# Emergencies are sent to everybody logged in. -# -*.emerg :omusrmsg:*