Current state

diff --git a/.etckeeper b/.etckeeper
index d1557d731492b59bd72c48069793f730c9ac3d4c..457931f7f52c237c2bceefcaa0299b4b4c2d397d 100755 (executable)
--- a/.etckeeper
+++ b/.etckeeper
@@ -36,7 +36,7 @@ mkdir -p './udev/hwdb.d'
 mkdir -p './udev/rules.d'
 maybe chmod 0755 '.'
 maybe chmod 0700 '.etckeeper'
-maybe chmod 0644 '.gitignore'
+maybe chmod 0600 '.gitignore'
 maybe chmod 0644 'Muttrc'
 maybe chmod 0755 'Muttrc.d'
 maybe chmod 0644 'Muttrc.d/charset.rc'
@@ -487,7 +487,6 @@ maybe chmod 0755 'modprobe.d'
 maybe chmod 0644 'modprobe.d/fbdev-blacklist.conf'
 maybe chmod 0644 'modules'
 maybe chmod 0755 'modules-load.d'
-maybe chmod 0644 'motd'
 maybe chmod 0644 'motd.tail'
 maybe chmod 0755 'mysql'
 maybe chmod 0755 'mysql/conf.d'

diff --git a/.gitignore b/.gitignore
index 9196cf5ca490c1ab2ae91f7c359f8f52c50344f9..f1a53d8393d848847fa20da4838e8c67d4ee1661 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -43,6 +43,7 @@ cups/subscriptions.conf
 cups/subscriptions.conf.O
 fake-hwclock.data
 check_mk/logwatch.state
+/motd
 
 # editor temp files
 *~

diff --git a/logrotate.conf b/logrotate.conf
index 4bd60ab4e4ed4adf2ab21f04970166f743095353..b504c76f13a396cf6e25052c2136ceaca2218251 100644 (file)
--- a/logrotate.conf
+++ b/logrotate.conf
@@ -3,13 +3,14 @@
 weekly
 
 # keep 4 weeks worth of backlogs
-rotate 4
+rotate 99
 
 # create new (empty) log files after rotating old ones
 create
 
 # uncomment this if you want your log files compressed
-#compress
+compress
+delaycompress
 
 # packages drop log rotation information into this directory
 include /etc/logrotate.d
@@ -19,14 +20,16 @@ include /etc/logrotate.d
     missingok
     monthly
     create 0664 root utmp
-    rotate 1
+    rotate 12
+    size 4M
 }
 
 /var/log/btmp {
     missingok
     monthly
     create 0660 root utmp
-    rotate 1
+    rotate 12
+    size 4M
 }
 
 # system-specific logs may be configured here

diff --git a/logrotate.d/apt b/logrotate.d/apt
index 9a6e5d1555be6f005ca52fdb61d36e9603be3bf2..0551563e3108213bcab76b061a52a243f795e317 100644 (file)
--- a/logrotate.d/apt
+++ b/logrotate.d/apt
@@ -1,16 +1,23 @@
 /var/log/apt/term.log {
-  rotate 12
-  monthly
-  compress
-  missingok
-  notifempty
+       rotate 12
+       monthly
+       compress
+       delaycompress
+       missingok
+       notifempty
+       size 1M
+       dateext
 }
 
 /var/log/apt/history.log {
-  rotate 12
-  monthly
-  compress
-  missingok
-  notifempty
+       rotate 12
+       monthly
+       compress
+       delaycompress
+       missingok
+       notifempty
+       size 1M
+       dateext
 }
 
+# vim: ts=4 filetype=conf et

diff --git a/logrotate.d/aptitude b/logrotate.d/aptitude
index d6a0ba276cb0505390daa92175fbee43440364bf..c2b3959a1e8bcb86ab36ba0f0269fa16f1b0c590 100644 (file)
--- a/logrotate.d/aptitude
+++ b/logrotate.d/aptitude
@@ -1,7 +1,13 @@
 /var/log/aptitude {
-  rotate 6
-  monthly
-  compress
-  missingok
-  notifempty
+    rotate 6
+    monthly
+    compress
+    delaycompress
+    missingok
+    notifempty
+    size 1M
+    dateext
+    olddir /var/log/.old
 }
+
+# vim: ts=4 filetype=conf et

diff --git a/logrotate.d/dpkg b/logrotate.d/dpkg
index b071698a1990071e0cef2a9d47b80bdbb5165557..0b0c14435a037c10bbadc487f3e925c7bf21a077 100644 (file)
--- a/logrotate.d/dpkg
+++ b/logrotate.d/dpkg
@@ -5,7 +5,10 @@
        delaycompress
        missingok
        notifempty
+       size 1M
        create 644 root root
+       dateext
+       olddir /var/log/.old
 }
 /var/log/alternatives.log {
        monthly
@@ -14,5 +17,8 @@
        delaycompress
        missingok
        notifempty
+       size 1M
        create 644 root root
+       dateext
+       olddir /var/log/.old
 }

diff --git a/logrotate.d/rsyslog b/logrotate.d/rsyslog
index d75287c25183fd8726b67df220ff0100145309f0..5463612c8043a2520ad2796ac2ff0bef770eb4fb 100644 (file)
--- a/logrotate.d/rsyslog
+++ b/logrotate.d/rsyslog
@@ -1,16 +1,22 @@
 /var/log/syslog
+/var/log/messages
 {
-       rotate 7
-       daily
-       missingok
-       notifempty
-       delaycompress
-       compress
-       postrotate
-               invoke-rc.d rsyslog rotate > /dev/null
-       endscript
+    rotate 7
+    daily
+    missingok
+    notifempty
+    delaycompress
+    compress
+    dateext
+    size 4M
+    olddir /var/log/.old
+    sharedscripts
+    postrotate
+        invoke-rc.d rsyslog rotate > /dev/null
+    endscript
 }
 
+/var/log/all.log
 /var/log/mail.info
 /var/log/mail.warn
 /var/log/mail.err
@@ -22,16 +28,38 @@
 /var/log/lpr.log
 /var/log/cron.log
 /var/log/debug
-/var/log/messages
+/var/log/debug.log
 {
-       rotate 4
-       weekly
-       missingok
-       notifempty
-       compress
-       delaycompress
-       sharedscripts
-       postrotate
-               invoke-rc.d rsyslog rotate > /dev/null
-       endscript
+    rotate 4
+    weekly
+    missingok
+    notifempty
+    compress
+    delaycompress
+    dateext
+    size 4M
+    olddir /var/log/.old
+    sharedscripts
+    postrotate
+        invoke-rc.d rsyslog rotate > /dev/null
+    endscript
+}
+
+/var/log/syslog.d/*.log {
+    rotate 10
+    weekly
+    missingok
+    notifempty
+    size 4M
+    delaycompress
+    dateext
+    compress
+    olddir /var/log/syslog.d/.old
+    sharedscripts
+    postrotate
+        invoke-rc.d rsyslog rotate > /dev/null
+    endscript
 }
+
+
+# vim: ts=4 filetype=conf et

diff --git a/logrotate.d/salt-common b/logrotate.d/salt-common
index 3cd002308e832615fe3028c42763cbd788cb1ed3..3905e4c6ce03ebcfb357daa1fdbbf72c13380ace 100644 (file)
--- a/logrotate.d/salt-common
+++ b/logrotate.d/salt-common
@@ -4,6 +4,11 @@
        rotate 7
        compress
        notifempty
+    size +1M
+    sharedscripts
+    postrotate
+        invoke-rc.d salt-master restart > /dev/null
+    endscript
 }
 
 /var/log/salt/minion {
@@ -12,12 +17,20 @@
        rotate 7
        compress
        notifempty
+    size +1M
+    sharedscripts
+    postrotate
+        invoke-rc.d salt-minion restart > /dev/null
+    endscript
 }
 
-/var/log/salt/key {
+/var/log/salt/key /var/log/salt/*.log {
        weekly
        missingok
        rotate 7
        compress
        notifempty
+    size +1M
 }
+
+# vim: ts=4 filetype=conf et

diff --git a/motd b/motd
deleted file mode 100644 (file)
index 3249b2d..0000000
--- a/motd
+++ /dev/null
@@ -1,15 +0,0 @@
-Linux karla 4.7.0-0.bpo.1-amd64 #1 SMP Debian 4.7.8-1~bpo8+1 (2016-10-19) x86_64 GNU/Linux
-Debian GNU/Linux 8.6 (jessie)
- _  __          _       
-| |/ /__ _ _ __| | __ _ 
-| ' // _` | '__| |/ _` |
-| . \ (_| | |  | | (_| |
-|_|\_\__,_|_|  |_|\__,_|
-                        
-
-In der Bundeswehr wird man nun als Erwachsener vor die Alternative
-gestellt Latrinen zu putzen oder den Gottesdienst zu besuchen.
-               -- Frank Welker
-
-Today is Sweetmorn, the 14th day of The Aftermath in the YOLD 3182
-