From: Frank Brehm Date: Wed, 2 Nov 2016 10:53:13 +0000 (+0100) Subject: Current state X-Git-Url: https://git.uhu-banane.de/?a=commitdiff_plain;h=01a1a13e12cb87bdb6b713bfdada15a703efed9b;p=config%2Fsarah%2Fetc.git Current state --- diff --git a/.etckeeper b/.etckeeper index ba29cc9..5bf0d3a 100755 --- a/.etckeeper +++ b/.etckeeper @@ -749,7 +749,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 9196cf5..05eeb7a 100644 --- a/.gitignore +++ b/.gitignore @@ -44,6 +44,8 @@ cups/subscriptions.conf.O fake-hwclock.data check_mk/logwatch.state +/motd + # editor temp files *~ .*.sw? diff --git a/logrotate.d/salt-common b/logrotate.d/salt-common index 3cd0023..fca9264 100644 --- a/logrotate.d/salt-common +++ b/logrotate.d/salt-common @@ -1,23 +1,37 @@ /var/log/salt/master { weekly missingok + dateext rotate 7 compress notifempty + size +1M + sharedscripts + postrotate + invoke-rc.d salt-master restart > /dev/null + endscript } /var/log/salt/minion { weekly missingok + dateext rotate 7 compress notifempty + size +1M + sharedscripts + postrotate + invoke-rc.d salt-minion restart > /dev/null + endscript } /var/log/salt/key { weekly missingok + dateext rotate 7 compress notifempty + size +1M } diff --git a/motd b/motd deleted file mode 100644 index e760b90..0000000 --- a/motd +++ /dev/null @@ -1,15 +0,0 @@ -Linux sarah 4.6.0-0.bpo.1-amd64 #1 SMP Debian 4.6.3-1~bpo8+1 (2016-07-13) x86_64 GNU/Linux -Debian GNU/Linux 8.6 (jessie) - ____ _ -/ ___| __ _ _ __ __ _| |__ -\___ \ / _` | '__/ _` | '_ \ - ___) | (_| | | | (_| | | | | -|____/ \__,_|_| \__,_|_| |_| - - -Es nützt dem Menschen nichts, den Mond zu gewinnen, wenn er dabei die -Erde verliert. - -- Francois Mauriac - -Today is Sweetmorn, the 14th day of The Aftermath in the YOLD 3182 -