saving uncommitted changes in /etc prior to emerge run

diff --git a/.etckeeper b/.etckeeper
index dbe94a3dd5cfed36078ec69c0253cd0711a75441..ef801b4275baefca200ae14605a268ab77c47a46 100755 (executable)
--- a/.etckeeper
+++ b/.etckeeper
@@ -651,7 +651,6 @@ maybe chmod 0644 'logrotate.d/ppd'
 maybe chmod 0644 'logrotate.d/rsyncd'
 maybe chmod 0644 'logrotate.d/rsyslog'
 maybe chmod 0644 'logrotate.d/salt'
-maybe chmod 0644 'logrotate.d/syslog-ng'
 maybe chmod 0644 'lsb-release'
 maybe chmod 0755 'lvm'
 maybe chmod 0700 'lvm/archive'

diff --git a/logrotate.d/rsyslog b/logrotate.d/rsyslog
index 1eae30e0d7415de7b1f846a58a8b10fa73ab1d7f..666742f02cdb195f70df353d1b7c72b1e1beaf71 100644 (file)
--- a/logrotate.d/rsyslog
+++ b/logrotate.d/rsyslog
@@ -13,25 +13,62 @@
 #      endscript
 #}
 
-/var/log/auth.log
-/var/log/cron.log
-/var/log/daemon.log
-/var/log/kern.log
-/var/log/lpr.log
-/var/log/mail.log
-/var/log/news.log
-/var/log/user.log
-/var/log/debug.log
-/var/log/messages
-{
-       rotate 4
-       weekly
-       missingok
-       notifempty
-       compress
-       delaycompress
+#/var/log/auth.log
+#/var/log/cron.log
+#/var/log/daemon.log
+#/var/log/kern.log
+#/var/log/lpr.log
+#/var/log/mail.log
+#/var/log/news.log
+#/var/log/user.log
+#/var/log/debug.log
+#/var/log/messages
+#{
+#      rotate 4
+#      weekly
+#      missingok
+#      notifempty
+#      compress
+#      delaycompress
+#      sharedscripts
+#      postrotate
+#              test -r /run/rsyslogd.pid && kill -HUP $(cat /run/rsyslogd.pid) &>/dev/null
+#      endscript
+#}
+
+/var/log/messages /var/log/syslog {
+    daily
+    missingok
+    olddir /var/log/.old
+    size 1024K
+       sharedscripts
+       postrotate
+               test -r /run/rsyslogd.pid && kill -HUP $(cat /run/rsyslogd.pid) &>/dev/null
+       endscript
+}
+
+/var/log/syslog.d/*.log {
+    daily
+    missingok
+    olddir /var/log/syslog.d/.old
+    size 1024K
+    maxage 1y
+       sharedscripts
+       postrotate
+               test -r /run/rsyslogd.pid && kill -HUP $(cat /run/rsyslogd.pid) &>/dev/null
+       endscript
+}
+
+/var/log/debug.log /var/log/debug /var/log/all /var/log/all.log {
+    daily
+    missingok
+    olddir /var/log/.old
+    size 4M
+    maxage 6m
        sharedscripts
        postrotate
                test -r /run/rsyslogd.pid && kill -HUP $(cat /run/rsyslogd.pid) &>/dev/null
        endscript
 }
+
+

diff --git a/logrotate.d/syslog-ng b/logrotate.d/syslog-ng
deleted file mode 100644 (file)
index e3d664c..0000000
--- a/logrotate.d/syslog-ng
+++ /dev/null
@@ -1,16 +0,0 @@
-# $Id$
-#
-# Syslog-ng logrotate snippet for Gentoo Linux
-# contributed by Michael Sterrett
-#
-
-/var/log/messages {
-    weekly
-    missingok
-    olddir /var/log/.old
-    size +1M
-    sharedscripts
-    postrotate
-        /etc/init.d/syslog-ng reload > /dev/null 2>&1 || true
-    endscript
-}