From 31052b7f62016c8479dbbe59bbc7ba268a43e5f7 Mon Sep 17 00:00:00 2001 From: Frank Brehm Date: Mon, 29 Jan 2018 12:29:09 +0100 Subject: [PATCH] saving uncommitted changes in /etc prior to emerge run --- .etckeeper | 1 + rsyslog.d/50-default.conf | 12 ++++ rsyslog.d/50-default.conf.default | 107 ++++++++++++++++++++++++++++++ rsyslog.d/60-fb.conf | 3 + 4 files changed, 123 insertions(+) create mode 100644 rsyslog.d/50-default.conf.default diff --git a/.etckeeper b/.etckeeper index e75d152..7b4a835 100755 --- a/.etckeeper +++ b/.etckeeper @@ -1880,6 +1880,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/50-default.conf.default' maybe chmod 0644 'rsyslog.d/60-fb.conf' maybe chmod 0755 'runlevels' maybe chmod 0755 'runlevels/boot' diff --git a/rsyslog.d/50-default.conf b/rsyslog.d/50-default.conf index c05ff4c..561aa93 100644 --- a/rsyslog.d/50-default.conf +++ b/rsyslog.d/50-default.conf @@ -3,6 +3,7 @@ ####################### #auth,authpriv.* action( +# name="action_auth" # type="omfile" # File="/var/log/auth.log" # FileCreateMode="0600" @@ -12,6 +13,7 @@ #) #cron.* action( +# name="action_cron" # type="omfile" # File="/var/log/cron.log" # FileOwner="root" @@ -19,6 +21,7 @@ #) #daemon.* action( +# name="action_daemon" # type="omfile" # File="/var/log/daemon.log" # FileOwner="root" @@ -26,6 +29,7 @@ #) #kern.* action( +# name="action_kern" # type="omfile" # File="/var/log/kern.log" # FileOwner="root" @@ -33,6 +37,7 @@ #) #lpr.* action( +# name="action_lpr" # type="omfile" # File="/var/log/lpr.log" # FileOwner="root" @@ -40,6 +45,7 @@ #) #mail.* action( +# name="action_mail" # type="omfile" # File="/var/log/mail.log" # FileOwner="root" @@ -47,6 +53,7 @@ #) #news.* action( +# name="action_news" # type="omfile" # File="/var/log/news.log" # FileOwner="root" @@ -54,6 +61,7 @@ #) #user.* action( +# name="action_user" # type="omfile" # File="/var/log/user.log" # FileOwner="root" @@ -61,6 +69,7 @@ #) *.=debug;auth,authpriv,news,mail.none action( + name="action_debug" type="omfile" File="/var/log/debug.log" FileOwner="root" @@ -68,6 +77,7 @@ ) *.info;auth,authpriv,cron,daemon,lpr,mail,news.none action( + name="action_messages" type="omfile" File="/var/log/messages" FileOwner="root" @@ -78,6 +88,7 @@ # deprecated "/var/log/syslog" log file (don't forget to re-enable log # rotation in "/etc/logrotate.d/rsyslog" if you do that!) #*.*;auth,authpriv.none action( +# name="action_syslog" # type="omfile" # File="/var/log/syslog" # FileOwner="root" @@ -85,6 +96,7 @@ #) *.emerg action( + name="action_emerge" type="omusrmsg" Users="*" action.execOnlyOnceEveryInterval="10" diff --git a/rsyslog.d/50-default.conf.default b/rsyslog.d/50-default.conf.default new file mode 100644 index 0000000..920c214 --- /dev/null +++ b/rsyslog.d/50-default.conf.default @@ -0,0 +1,107 @@ +####################### +### DEFAULT ACTIONS ### +####################### + +auth,authpriv.* action( + name="action_auth" + type="omfile" + File="/var/log/auth.log" + FileCreateMode="0600" + FileOwner="root" + FileGroup="adm" + Sync="off" +) + +cron.* action( + name="action_cron" + type="omfile" + File="/var/log/cron.log" + FileOwner="root" + FileGroup="adm" +) + +daemon.* action( + name="action_daemon" + type="omfile" + File="/var/log/daemon.log" + FileOwner="root" + FileGroup="adm" +) + +kern.* action( + name="action_kern" + type="omfile" + File="/var/log/kern.log" + FileOwner="root" + FileGroup="adm" +) + +lpr.* action( + name="action_lpr" + type="omfile" + File="/var/log/lpr.log" + FileOwner="root" + FileGroup="adm" +) + +mail.* action( + name="action_mail" + type="omfile" + File="/var/log/mail.log" + FileOwner="root" + FileGroup="adm" +) + +news.* action( + name="action_news" + type="omfile" + File="/var/log/news.log" + FileOwner="root" + FileGroup="adm" +) + +user.* action( + name="action_user" + type="omfile" + File="/var/log/user.log" + FileOwner="root" + FileGroup="adm" +) + +*.=debug;auth,authpriv,news,mail.none action( + name="action_debug" + type="omfile" + File="/var/log/debug.log" + FileOwner="root" + FileGroup="adm" +) + +*.info;auth,authpriv,cron,daemon,lpr,mail,news.none action( + name="action_messages" + type="omfile" + File="/var/log/messages" + FileOwner="root" + FileGroup="adm" +) + +# Uncomment the following directive to re-enable the +# deprecated "/var/log/syslog" log file (don't forget to re-enable log +# rotation in "/etc/logrotate.d/rsyslog" if you do that!) +#*.*;auth,authpriv.none action( +# name="action_syslog" +# type="omfile" +# File="/var/log/syslog" +# FileOwner="root" +# FileGroup="adm" +#) + +*.emerg action( + name="action_emerge" + type="omusrmsg" + Users="*" + action.execOnlyOnceEveryInterval="10" +) + +# Create an additional socket for the default chroot location +# (used by net-misc/openssh[hpn], see https://bugs.gentoo.org/490744) +input(type="imuxsock" Socket="/var/empty/dev/log") diff --git a/rsyslog.d/60-fb.conf b/rsyslog.d/60-fb.conf index ce22dd5..d279000 100644 --- a/rsyslog.d/60-fb.conf +++ b/rsyslog.d/60-fb.conf @@ -6,6 +6,7 @@ template ( ) *.* action( + name="action_facility" type="omfile" DynaFile="facility" DirCreateMode="0755" @@ -15,6 +16,7 @@ template ( ) *.* action( + name="action_all" type="omfile" File="/var/log/all.log" FileOwner="root" @@ -23,6 +25,7 @@ template ( ) *.warn;news,mail.none action( + name="action_tty12" type="omfile" File="/dev/tty12" FileOwner="root" -- 2.39.5