[debian-lan-devel] [SCM] Debian-LAN development and packaging branch, master, updated. 0.7-29-g67adb61

[Andreas B. Mundt]

The following commit has been merged in the master branch:
commit 1bcc1d3aace9e851e80f242308e555e7af0460a0
Author: Andreas B. Mundt <andi at debian.org>
Date:   Sat Feb 16 16:59:47 2013 +0100

    Mail server setup fixes and cleanup.
    
    Use host name alias 'mail' consistently.
    Fix dovecot mail location definition.
    Forward all mail for root to 'admin'.

diff --git a/fai/config/files/etc/ldap/ssl/slapd-cert.cnf/SERVER_A b/fai/config/files/etc/ldap/ssl/slapd-cert.cnf/SERVER_A
index 402c163..07c3a0e 100644
--- a/fai/config/files/etc/ldap/ssl/slapd-cert.cnf/SERVER_A
+++ b/fai/config/files/etc/ldap/ssl/slapd-cert.cnf/SERVER_A
@@ -16,18 +16,18 @@ OU = Automatically-generated LDAP SSL key
 ### make sure CN is also one of subjectAltName
 ###
 CN = mainserver.intern
-emailAddress = postmaster at postoffice.intern
+emailAddress = postmaster at mail.intern
 
 [ v3_req ]
 nsCertType = server
 subjectAltName=DNS:mainserver.intern,DNS:mainserver,DNS:ldap.intern,DNS:ldap,DNS:localhost
 
 ###
-### run LDAP service on a separate machine 
+### run LDAP service on a separate machine
 ### (server's IP must revresolv to ldap.intern)
 ###
 #commonName=ldap.intern
-#emailAddress=postmaster at postoffice.intern
+#emailAddress=postmaster at mail.intern
 
 #[ v3_req ]
 #nsCertType = server
diff --git a/fai/config/files/usr/local/sbin/gosa-create/GOSA b/fai/config/files/usr/local/sbin/gosa-create/GOSA
index 6405ae8..4ebe7aa 100755
--- a/fai/config/files/usr/local/sbin/gosa-create/GOSA
+++ b/fai/config/files/usr/local/sbin/gosa-create/GOSA
@@ -50,7 +50,7 @@ welcome to the mail-system.
 Your userID is $USERID, and your email
 address is:
 
-      $USERID at postoffice.intern
+      $USERID at mail.intern
 
 Regards,
 
diff --git a/fai/config/scripts/DNS_SERVER/10-zones b/fai/config/scripts/DNS_SERVER/10-zones
index 1c607ae..8e26269 100755
--- a/fai/config/scripts/DNS_SERVER/10-zones
+++ b/fai/config/scripts/DNS_SERVER/10-zones
@@ -37,7 +37,7 @@ REV=`echo $MAINSERVER_IPADDR | cut -d "." --fields=4`
 
 cat > $target$FILE <<EOF
 \$TTL 500
-@               IN      SOA     mainserver.intern. root.postoffice.intern. (
+@               IN      SOA     mainserver.intern. root.mail.intern. (
                                 1 ; Serialnumber
                                 3600    ; Refresh
                                 1800    ; Retry
@@ -66,7 +66,7 @@ done
 
 cat > $target/etc/bind/db.intern <<EOF
 \$TTL 500
-@               IN      SOA     mainserver.intern. root.postoffice.intern. (
+@               IN      SOA     mainserver.intern. root.mail.intern. (
                                 1 ; Serialnumber
                                 3600    ; Refresh
                                 1800    ; Retry
@@ -97,7 +97,6 @@ domain                  CNAME   mainserver.intern.
 ldap                    CNAME   mainserver.intern.
 kerberos                CNAME   mainserver.intern.
 mail                    CNAME   mainserver.intern.
-postoffice              CNAME   mainserver.intern.
 syslog                  CNAME   mainserver.intern.
 faiserver               CNAME   mainserver.intern.
 swapserver              CNAME   mainserver.intern.
diff --git a/fai/config/scripts/KDC_LDAP/10-slapd-KDC b/fai/config/scripts/KDC_LDAP/10-slapd-KDC
index e74b3b6..291aad1 100755
--- a/fai/config/scripts/KDC_LDAP/10-slapd-KDC
+++ b/fai/config/scripts/KDC_LDAP/10-slapd-KDC
@@ -195,6 +195,8 @@ init_KDC() {
 	cp -r $target/etc/skel $target/$HOMEDIR
 	$ROOTCMD chmod -R o-rwx $HOMEDIR
 	$ROOTCMD chown -R $USID:$GRID $HOMEDIR
+	## Forward all mail for root to admin:
+	ainsl /etc/aliases "root: admin"
     fi
     $ROOTCMD kadmin.local -q "modify_policy -minlength 4 -minclasses 2 default"
 
diff --git a/fai/config/scripts/MAIL_SERVER/20-dovecot b/fai/config/scripts/MAIL_SERVER/20-dovecot
index 3ddfb1f..18975de 100755
--- a/fai/config/scripts/MAIL_SERVER/20-dovecot
+++ b/fai/config/scripts/MAIL_SERVER/20-dovecot
@@ -11,3 +11,7 @@ editfiles:
           ReplaceAll "#auth_krb5_keytab =.*" With "auth_krb5_keytab = /etc/krb5.keytab.imap"
           ReplaceAll "auth_mechanisms = plain" With "auth_mechanisms = gssapi plain"
       }
+      { ${target}/etc/dovecot/conf.d/10-mail.conf
+          ReplaceAll "^mail_location = mbox:~/mail:INBOX=/var/mail/%u"
+          With "mail_location = maildir:~/Maildir"
+      }

-- 
Debian-LAN development and packaging