saving uncommitted changes in /etc prior to emerge run

diff --git a/.etckeeper b/.etckeeper
index 324957f8044be8a21e65bf2c82766d6aa9f89a00..3944610a7a55e8f7015bcd3ea45e0c562e6f25c1 100755 (executable)
--- 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 da484598a652c16d6c90229c533ae93bdc16a196..4de4ccb73680c5b731ec64d041f640d129792872 100644 (file)
--- 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 9ae8578215bb06860570ef49401210b5e7940996..c05ff4c10d5a0e1b27658e79f48715a90d02158a 100644 (file)
--- 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 (file)
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 (symlink)
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 (symlink)
index 83ec2ac..0000000
--- a/runlevels/default/syslog-ng
+++ /dev/null
@@ -1 +0,0 @@
-/etc/init.d/syslog-ng
\ No newline at end of file