saving uncommitted changes in /etc prior to emerge run

diff --git a/cron.daily/logrotate.cron b/cron.daily/logrotate.cron
index 63cbe96891b996bfa21829e970efd3f2c59e981e..91a59e64b81addc59e8a6633172830157350b862 100755 (executable)
--- a/cron.daily/logrotate.cron
+++ b/cron.daily/logrotate.cron
@@ -1,3 +1,7 @@
 #! /bin/sh
 
-/usr/sbin/logrotate /etc/logrotate.conf
+#/usr/sbin/logrotate /etc/logrotate.conf
+if [ -x /usr/scripts/logrotate.pl ] ; then
+    /usr/scripts/logrotate.pl -v >>/var/log/logrotate.log
+fi
+

diff --git a/logrotate.conf b/logrotate.conf
index 25dd13495e13c36e31031447d5e0f8487113231b..3968f20b75112f55342e8fdfe4ce1bc2aab45b1f 100644 (file)
--- a/logrotate.conf
+++ b/logrotate.conf
@@ -9,7 +9,9 @@ weekly
 #daily
 
 # keep 4 weeks worth of backlogs
-rotate 4
+#rotate 4
+rotate 10
+maxage 2y
 
 # create new (empty) log files after rotating old ones
 create
@@ -17,28 +19,34 @@ create
 # use date as a suffix of the rotated file
 dateext
 
+tabooprefix    \.
+
 # uncomment this if you want your log files compressed
 compress
 
-# packages can drop log rotation information into this directory
-include /etc/logrotate.d
-
 notifempty
-nomail
+#nomail
 noolddir
 
+# is it okay, if a logfile doesn't exists ?
+missingok
+
+# packages can drop log rotation information into this directory
+include /etc/logrotate.d
+
 # no packages own lastlog or wtmp -- we'll rotate them here
 /var/log/wtmp {
     monthly
     create 0664 root utmp
-    rotate 1
+    size=4096K
+    rotate 12
 }
 
 /var/log/btmp {
     missingok
     monthly
     create 0600 root utmp
-    rotate 1
+    rotate 12
 }
 
 # system-specific logs may be also be configured here.

diff --git a/logrotate.d/apache2 b/logrotate.d/apache2
index 9dd431c2b0159606ff235d2041127cbf83e0caa1..13ad07fcd75fd61a3c60226a072bcb046bdaeb34 100644 (file)
--- a/logrotate.d/apache2
+++ b/logrotate.d/apache2
@@ -1,11 +1,27 @@
 # Apache2 logrotate snipet for Gentoo Linux
 # Contributes by Chuck Short
 #
+#/var/log/apache2/*log {
+#      missingok
+#      notifempty
+#      sharedscripts
+#      postrotate
+#      /etc/init.d/apache2 reload > /dev/null 2>&1 || true
+#      endscript
+#}
+
+script apache2-reload
+    /etc/init.d/apache2 reload >/dev/null || true
+endscript
+
+#rotate 10
+daily
+
 /var/log/apache2/*log {
-  missingok
-  notifempty
-  sharedscripts
-  postrotate
-  /etc/init.d/apache2 reload > /dev/null 2>&1 || true
-  endscript
+    size 4m
+    olddir /var/log/apache2/%Y-%m
+    postrotate apache2-reload
 }
+
+
+# vim: ts=4 filetype=conf

diff --git a/logrotate.d/clamav b/logrotate.d/clamav
index 12c77e020c28059792535ad24d9940c0c6064936..f39d26fd98eae15c6b3f9663ea3267205a251bbe 100644 (file)
--- a/logrotate.d/clamav
+++ b/logrotate.d/clamav
@@ -13,3 +13,5 @@
                /bin/kill -HUP `cat /var/run/clamav/freshclam.pid 2> /dev/null` 2>/dev/null || true
        endscript
 }
+
+# vim: ts=4 filetype=conf

diff --git a/logrotate.d/elog-save-summary b/logrotate.d/elog-save-summary
index f2cfc66747f6ac4bf8b6a1e0b08c954cb8fd8c52..d3fca9008c7faa9219179e6ccc0edeb5d529678c 100644 (file)
--- a/logrotate.d/elog-save-summary
+++ b/logrotate.d/elog-save-summary
@@ -3,8 +3,10 @@
 # Rotate the log created by the save_summary elog module.
 
 /var/log/portage/elog/summary.log {
-    su portage portage
+    # su portage portage
     missingok
     nocreate
     delaycompress
 }
+
+# vim: ts=4 filetype=conf

diff --git a/logrotate.d/mysql b/logrotate.d/mysql
index 3399e30df5385980cf4832c37d463f294bb08152..e8d3cc93b0a9109c3b2013bccab8c99bd37cb03e 100644 (file)
--- a/logrotate.d/mysql
+++ b/logrotate.d/mysql
@@ -3,13 +3,15 @@
 # $Header: /var/cvsroot/gentoo-x86/dev-db/mysql-init-scripts/files/logrotate.mysql,v 1.2 2011/01/13 20:06:06 robbat2 Exp $
 
 /var/log/mysql/mysql.err /var/log/mysql/mysql.log /var/log/mysql/mysqld.err {
-monthly
-create 660 mysql mysql
-notifempty
-size 5M
-sharedscripts
-missingok
-postrotate
-[ -f /var/run/mysqld/mysqld.pid ] && /bin/kill -HUP `cat /var/run/mysqld/mysqld.pid`
-endscript
+       monthly
+       create 660 mysql mysql
+       notifempty
+       size 5M
+       sharedscripts
+       missingok
+       postrotate
+               [ -f /var/run/mysqld/mysqld.pid ] && /bin/kill -HUP `cat /var/run/mysqld/mysqld.pid`
+       endscript
 }
+
+# vim: ts=4 filetype=conf

diff --git a/logrotate.d/openrc b/logrotate.d/openrc
index a168f2361b38246ead1e3ea036b65459d6100ce5..38462b190c4ff98dcc6ab49fcadf5bfc86396666 100644 (file)
--- a/logrotate.d/openrc
+++ b/logrotate.d/openrc
@@ -5,3 +5,5 @@
        missingok
        notifempty
 }
+
+# vim: ts=4 filetype=conf

diff --git a/logrotate.d/rsyncd b/logrotate.d/rsyncd
index 34bcf72d210c8649c78c9e8a9f2513b0143c7bcb..1b5d3b3f6a9f410491e585f20d9c0d9214af161c 100644 (file)
--- a/logrotate.d/rsyncd
+++ b/logrotate.d/rsyncd
@@ -7,3 +7,5 @@
        missingok
        copytruncate
 }
+
+# vim: ts=4 filetype=conf

diff --git a/logrotate.d/syslog-ng b/logrotate.d/syslog-ng
index e982686de023aa71b8e19cd7d3a12b799397ef68..5c94da4a876aecdd6f71aa5fcb1e14c153e2c519 100644 (file)
--- a/logrotate.d/syslog-ng
+++ b/logrotate.d/syslog-ng
@@ -4,10 +4,55 @@
 # contributed by Michael Sterrett
 #
 
+#/var/log/messages {
+#    missingok
+#    sharedscripts
+#    postrotate
+#        /etc/init.d/syslog-ng reload > /dev/null 2>&1 || true
+#    endscript
+#}
+
+script syslog-reload
+    /etc/init.d/syslog-ng reload >/dev/null || true
+endscript
+
 /var/log/messages {
-    missingok
-    sharedscripts
-    postrotate
-        /etc/init.d/syslog-ng reload > /dev/null 2>&1 || true
-    endscript
+    daily
+    olddir /var/log/.old/%Y-%m
+    size 1024K
+    postrotate syslog-reload
+}
+
+/var/log/syslog.d/* {
+    daily
+    olddir /var/log/syslog.d/.old/%Y-%m
+    size 1024K
+    postrotate syslog-reload
+    maxage 1y
+}
+
+/var/log/debug.log {
+    daily
+    olddir /var/log/.old/%Y-%m
+    size 4M
+    postrotate syslog-reload
+    maxage 6m
 }
+
+/var/log/mail/authdaemond  /var/log/mail/amavis* /var/log/mail/imapd* /var/log/mail/pop3d* /var/log/mail/postgrey /var/log/mail/spam* {
+    daily
+    olddir /var/log/mail/.old/%Y-%m
+    size 1024K
+    postrotate syslog-reload
+    maxage 1y
+}
+
+/var/log/mail/postfix/* {
+    daily
+    olddir /var/log/mail/.old/postfix/%Y-%m
+    size 1024K
+    postrotate syslog-reload
+    maxage 1y
+}
+
+# vim: ts=4 filetype=conf

diff --git a/motd b/motd
index c116e6067b2b94c2c203895b260e78a9645bc4fd..e6af94c036cb9a12481d81825b533944af66d025 100644 (file)
--- a/motd
+++ b/motd
@@ -7,9 +7,9 @@ Gentoo Base System release 2.0.3
  \___/|_| |_|\__,_| |_|
                        
 
-Liebe ist die Anziehungskraft des Geistes, wie die Schwerkraft die
-Anziehungskraft der Körper ist.
-               -- Valerie Marie Breton
+Hey, sonst denkt ihr auch immer, Joey wäre eine multiple
+Persönlichkeit.  Dann zählt die gefälligst auch so.
+               -- Martin Schulze
 
 Today is Pungenday, the 28th day of Chaos in the YOLD 3178
 

diff --git a/portage/package.keywords b/portage/package.keywords
index 97f60a77dd6f314b68d3aff6ba8da2bbc568b351..65ae2333ebee70472efaaaa0d239e77025331b34 100644 (file)
--- a/portage/package.keywords
+++ b/portage/package.keywords
@@ -1,3 +1,8 @@
+
+~app-admin/ulogd-2.0.0_beta4
+
 ~net-analyzer/tcptrace-6.6.7
 
+~net-libs/libnetfilter_log-1.0.1
+
 ~sys-apps/etckeeper-0.58