From 26491d16fb75718e531011f0e07cfdc3ec91f83f Mon Sep 17 00:00:00 2001 From: root Date: Thu, 17 Dec 2015 10:43:28 +0100 Subject: [PATCH] saving uncommitted changes in /etc prior to emerge run --- .etckeeper | 1 + rsyslog.conf | 17 ++++-- rsyslog.d/50-default.conf | 100 ++++++++++++++++++------------------ rsyslog.d/60-fb.conf | 32 ++++++++++++ runlevels/default/rsyslog | 1 + runlevels/default/syslog-ng | 1 - 6 files changed, 98 insertions(+), 54 deletions(-) create mode 100644 rsyslog.d/60-fb.conf create mode 120000 runlevels/default/rsyslog delete mode 120000 runlevels/default/syslog-ng diff --git a/.etckeeper b/.etckeeper index 324957f..3944610 100755 --- a/.etckeeper +++ b/.etckeeper @@ -856,6 +856,7 @@ maybe chmod 0644 'rsyslog.conf' maybe chmod 0755 'rsyslog.d' maybe chmod 0644 'rsyslog.d/.keep_app-admin_rsyslog-0' maybe chmod 0644 'rsyslog.d/50-default.conf' +maybe chmod 0644 'rsyslog.d/60-fb.conf' maybe chmod 0755 'runlevels' maybe chmod 0755 'runlevels/boot' maybe chmod 0755 'runlevels/default' diff --git a/rsyslog.conf b/rsyslog.conf index da48459..4de4ccb 100644 --- a/rsyslog.conf +++ b/rsyslog.conf @@ -11,7 +11,7 @@ # own more advanced configuration: http://www.rsyslog.com/rsyslog-configuration-builder/ # Check config syntax on startup and abort if unclean (default: off) -#$AbortOnUncleanConfig on +$AbortOnUncleanConfig on ############### @@ -25,7 +25,7 @@ module(load="imuxsock") module(load="imklog") # Inject "--MARK--" messages every $Interval (seconds) -#module(load="immark" Interval="600") +module(load="immark" Interval="3600") # Read syslog messages from UDP #module(load="imudp") @@ -35,6 +35,13 @@ module(load="imklog") #module(load="imtcp") #input(type="imtcp" port="514") +module(load="impstats" + interval="43200" + severity="7" + log.syslog="off" + /* need to turn log stream logging off! */ + log.file="/var/log/syslog.d/stats.log") + ######################### ### GLOBAL DIRECTIVES ### @@ -51,9 +58,13 @@ $Umask 0022 module( load="builtin:omfile" - Template="RSYSLOG_TraditionalFileFormat" + Template="RSYSLOG_FileFormat" FileCreateMode="0644" DirCreateMode="0755" + fileOwnerNum="0" + fileGroupNum="0" + dirOwnerNum="0" + dirGroupNum="0" ) diff --git a/rsyslog.d/50-default.conf b/rsyslog.d/50-default.conf index 9ae8578..c05ff4c 100644 --- a/rsyslog.d/50-default.conf +++ b/rsyslog.d/50-default.conf @@ -2,63 +2,63 @@ ### DEFAULT ACTIONS ### ####################### -auth,authpriv.* action( - type="omfile" - File="/var/log/auth.log" - FileCreateMode="0600" - FileOwner="root" - FileGroup="adm" - Sync="off" -) +#auth,authpriv.* action( +# type="omfile" +# File="/var/log/auth.log" +# FileCreateMode="0600" +# FileOwner="root" +# FileGroup="adm" +# Sync="off" +#) -cron.* action( - type="omfile" - File="/var/log/cron.log" - FileOwner="root" - FileGroup="adm" -) +#cron.* action( +# type="omfile" +# File="/var/log/cron.log" +# FileOwner="root" +# FileGroup="adm" +#) -daemon.* action( - type="omfile" - File="/var/log/daemon.log" - FileOwner="root" - FileGroup="adm" -) +#daemon.* action( +# type="omfile" +# File="/var/log/daemon.log" +# FileOwner="root" +# FileGroup="adm" +#) -kern.* action( - type="omfile" - File="/var/log/kern.log" - FileOwner="root" - FileGroup="adm" -) +#kern.* action( +# type="omfile" +# File="/var/log/kern.log" +# FileOwner="root" +# FileGroup="adm" +#) -lpr.* action( - type="omfile" - File="/var/log/lpr.log" - FileOwner="root" - FileGroup="adm" -) +#lpr.* action( +# type="omfile" +# File="/var/log/lpr.log" +# FileOwner="root" +# FileGroup="adm" +#) -mail.* action( - type="omfile" - File="/var/log/mail.log" - FileOwner="root" - FileGroup="adm" -) +#mail.* action( +# type="omfile" +# File="/var/log/mail.log" +# FileOwner="root" +# FileGroup="adm" +#) -news.* action( - type="omfile" - File="/var/log/news.log" - FileOwner="root" - FileGroup="adm" -) +#news.* action( +# type="omfile" +# File="/var/log/news.log" +# FileOwner="root" +# FileGroup="adm" +#) -user.* action( - type="omfile" - File="/var/log/user.log" - FileOwner="root" - FileGroup="adm" -) +#user.* action( +# type="omfile" +# File="/var/log/user.log" +# FileOwner="root" +# FileGroup="adm" +#) *.=debug;auth,authpriv,news,mail.none action( type="omfile" diff --git a/rsyslog.d/60-fb.conf b/rsyslog.d/60-fb.conf new file mode 100644 index 0000000..ce22dd5 --- /dev/null +++ b/rsyslog.d/60-fb.conf @@ -0,0 +1,32 @@ + +template ( + name="facility" + type="string" + string="/var/log/syslog.d/%syslogfacility-text%.log" +) + +*.* action( + type="omfile" + DynaFile="facility" + DirCreateMode="0755" + FileCreateMode="0644" + FileOwner="root" + FileGroup="adm" +) + +*.* action( + type="omfile" + File="/var/log/all.log" + FileOwner="root" + FileGroup="adm" + Sync="off" +) + +*.warn;news,mail.none action( + type="omfile" + File="/dev/tty12" + FileOwner="root" + FileGroup="root" +) + +# vim: filetype=conf diff --git a/runlevels/default/rsyslog b/runlevels/default/rsyslog new file mode 120000 index 0000000..c2a829b --- /dev/null +++ b/runlevels/default/rsyslog @@ -0,0 +1 @@ +/etc/init.d/rsyslog \ No newline at end of file diff --git a/runlevels/default/syslog-ng b/runlevels/default/syslog-ng deleted file mode 120000 index 83ec2ac..0000000 --- a/runlevels/default/syslog-ng +++ /dev/null @@ -1 +0,0 @@ -/etc/init.d/syslog-ng \ No newline at end of file -- 2.39.5