daily autocommit

diff --git a/.etckeeper b/.etckeeper
index 06d27b52004e516f986c64385743c906cd1b6787..198e52cfcffab1c62ef38ee5d2822935c380ca3b 100755 (executable)
--- a/.etckeeper
+++ b/.etckeeper
@@ -2283,6 +2283,7 @@ maybe chmod 0644 'mono/4.5/web.config'
 maybe chmod 0644 'mono/browscap.ini'
 maybe chmod 0755 'mono/certstore'
 maybe chmod 0644 'mono/config'
+maybe chmod 0644 'motd.tail'
 maybe chmod 0755 'mplayer'
 maybe chmod 0644 'mplayer/input.conf'
 maybe chmod 0644 'mplayer/menu.conf'

diff --git a/cron.d/greetings b/cron.d/greetings
index a3bf1b483df84b22ed124e4114c9cca2b229137a..24a67146ac3d855661eed13633db17a8fe94c243 100644 (file)
--- a/cron.d/greetings
+++ b/cron.d/greetings
@@ -1,3 +1,3 @@
 # Eine nette Begrüßung ...
-1,11,21,31,41,51  *   *  *  *   root test -x /root/bin/generate-motd.sh && /root/bin/generate-motd.sh >/dev/null
-@reboot                         root test -x /root/bin/generate-motd.sh && /root/bin/generate-motd.sh >/dev/null
+#1,11,21,31,41,51  *   *  *  *   root test -x /root/bin/generate-motd.sh && /root/bin/generate-motd.sh >/dev/null
+#@reboot                         root test -x /root/bin/generate-motd.sh && /root/bin/generate-motd.sh >/dev/null

diff --git a/motd.tail b/motd.tail
new file mode 100644 (file)
index 0000000..2fadcb6
--- /dev/null
+++ b/motd.tail
@@ -0,0 +1,6 @@
+ ____                   _ 
+| __ ) _ __ _   _ _ __ (_)
+|  _ \| '__| | | | '_ \| |
+| |_) | |  | |_| | | | | |
+|____/|_|   \__,_|_| |_|_|
+                          

diff --git a/update-motd.d/50-motd-news b/update-motd.d/50-motd-news
index 1a2485251c33a70432394c93fb89330ef214bfc9..b97dc05231e3571ef1b4f04c1ed53f5eb64529a7 100755 (executable)
--- a/update-motd.d/50-motd-news
+++ b/update-motd.d/50-motd-news
@@ -1 +1,27 @@
-#!/bin/sh
+#!/bin/bash
+
+export LC_ALL=de_DE.utf8
+
+uname -a
+/usr/bin/lsb_release -d | sed -e 's/^[         ]*Description[  ]*:[    ]*//'
+
+if [[ -f /etc/motd.tail ]] ; then
+    cat /etc/motd.tail
+fi
+
+if [[ -x /usr/bin/fortune ]] ; then
+    echo
+    /usr/bin/fortune de
+elif [[ -x /usr/games/fortune ]] ; then
+    echo
+    /usr/games/fortune de
+fi
+
+if [[ -x /usr/bin/ddate ]] ; then
+    echo
+    /usr/bin/ddate
+fi
+
+echo
+
+# vim: ts=4 expandtab list