From: Frank Brehm <frank@brehm-online.com>
Date: Tue, 17 Jan 2012 18:33:15 +0000 (+0100)
Subject: Weiter
X-Git-Url: https://git.uhu-banane.de/?a=commitdiff_plain;h=958950d47200c16381cffbdf03af29ec9ceee513;p=config%2Fbruni%2Fetc.git

Weiter
---

diff --git a/.etckeeper b/.etckeeper
index f158398f..772685dd 100755
--- a/.etckeeper
+++ b/.etckeeper
@@ -1084,6 +1084,7 @@ maybe chmod 0644 './lxdvdrip.conf'
 maybe chmod 0644 './machine-id'
 maybe chmod 0755 './mail'
 maybe chmod 0644 './mail/aliases'
+maybe chmod 0644 './mail/aliases.db'
 maybe chmod 0644 './mailcap'
 maybe chmod 0644 './make.conf'
 maybe chmod 0644 './make.conf.catalyst'
diff --git a/mail/aliases b/mail/aliases
index ea835059..8dde63ea 100644
--- a/mail/aliases
+++ b/mail/aliases
@@ -1,33 +1,61 @@
 # Basic system aliases -- these MUST be present.
-MAILER-DAEMON:      postmaster
-postmaster:         root
+MAILER-DAEMON:		postmaster
+postmaster:		root
+root:			frank
 
 # General redirections for pseudo accounts.
-adm:                root
-bin:                root
-daemon:             root
-exim:               root
-lp:                 root
-mail:               root
-named:              root
-nobody:             root
-postfix:            root
+adm:			root
+bin:			root
+daemon:			root
+exim:			root
+lp:			root
+mail:			root
+named:			root
+postfix:		root
 
 # Well-known aliases -- these should be filled in!
 # root:
 # operator:
 
 # Standard RFC2142 aliases
-abuse:              postmaster
-ftp:                root
-hostmaster:         root
-news:               usenet
-noc:                root
-security:           root
-usenet:             root
-uucp:               root
-webmaster:          root
-www:                webmaster
+abuse:			postmaster
+ftp:			root
+hostmaster:		root
+news:			usenet
+noc:			root
+security:		root
+usenet:			root
+uucp:			root
+webmaster:		root
+www:			webmaster
 
 # trap decode to catch security attacks
-# decode:           /dev/null
+noreply:		/dev/null
+decode:			noreply
+nobody:			noreply
+
+# Persönliche Aliase
+
+# Frank Brehm
+frank:			frank@brehm-online.com
+fbr:                    frank
+brehm:                  frank
+fbrehm:                 frank
+f.brehm:                frank
+f-brehm:                frank
+frank.brehm:            frank
+frank-brehm:            frank
+
+# Doris Hennig
+doris:			doris@hennig-berlin.org
+
+# Heiko Hennig
+patrick:                hennig-patrick@gmx.de
+
+# Heiko Hennig
+heiko:                  heiko-monkey-hennig@gmx.de
+
+# Vivien Winkler
+vivi:                   viviwinkler@gmx.de
+
+
diff --git a/mail/aliases.db b/mail/aliases.db
new file mode 100644
index 00000000..af66333d
Binary files /dev/null and b/mail/aliases.db differ
diff --git a/motd b/motd
index 4b7fd6f4..0a56fd84 100644
--- a/motd
+++ b/motd
@@ -7,11 +7,8 @@ Gentoo Base System release 2.0.3
 |____/|_|   \__,_|_| |_|_|
                           
 
-Wer das Falsche verteidigen will, hat alle Ursache, leise 
-aufzutreten und sich zu einer feinen Lebensart zu bekennen. Wer das 
-Recht auf seiner Seite fühlt, muss derb auftreten; ein höfliches 
-Recht will gar nichts heißen.
-		-- Goethe, Maximen und Reflektionen, Nr. 1028
+Legosthenie:
+  Bauklotzlegeschwäche bei Kleinkindern
 
 Today is Boomtime, the 17th day of Chaos in the YOLD 3178
 
diff --git a/postfix/main.cf b/postfix/main.cf
index a6b44744..dba4ff00 100644
--- a/postfix/main.cf
+++ b/postfix/main.cf
@@ -667,6 +667,7 @@ smtp_sasl_auth_enable = yes
 smtp_sasl_password_maps = hash:/etc/postfix/smtp_auth
 smtp_sasl_security_options = noanonymous
 relayhost = [mail.brehm-online.com]
+#relayhost = [helga-six.brehm-online.com]
 
 smtpd_use_tls = yes
 #smtpd_tls_auth_only = yes
@@ -688,3 +689,4 @@ smtp_tls_enforce_peername = no
 
 #debug_peer_list = 217.237.40.156
 
+inet_protocols = all
diff --git a/postfix/smtp_auth b/postfix/smtp_auth
index a6425a0f..cc7a77e0 100644
--- a/postfix/smtp_auth
+++ b/postfix/smtp_auth
@@ -1,2 +1,3 @@
 #auth.smtp.kundenserver.de	m319533-11:geheeim
 mail.brehm-online.com		vmail:uhu
+helga-six.brehm-online.com	vmail:uhu
diff --git a/postfix/smtp_auth.db b/postfix/smtp_auth.db
index 05ed4841..e93a0868 100644
Binary files a/postfix/smtp_auth.db and b/postfix/smtp_auth.db differ
diff --git a/smartd.conf b/smartd.conf
index 4c2ab49b..80214991 100644
--- a/smartd.conf
+++ b/smartd.conf
@@ -20,7 +20,7 @@
 # Directives listed below, which will be applied to all devices that
 # are found.  Most users should comment out DEVICESCAN and explicitly
 # list the devices that they wish to monitor.
-DEVICESCAN
+#DEVICESCAN
 
 # Alternative setting to ignore temperature and power-on hours reports
 # in syslog.