[debian-lan-devel] [SCM] Debian-LAN development and packaging branch, master, updated. 0.8-1-ge2f3c1b

[Andreas B. Mundt]

The following commit has been merged in the master branch:
commit e2f3c1b8a86fb98d5bad1c2334d4fe7d3a179a7b
Author: Andreas B. Mundt <andi at debian.org>
Date:   Wed Mar 13 14:24:28 2013 +0100

    Improve local mail setup.  Allow mails from clients to postmaster.
    
    Mails from clients are sent to postmaster at mail.intern and accepted by
    exim.  Stop Icinga from sending mails when a client host is down.

diff --git a/fai/config/debconf/CLIENT_A b/fai/config/debconf/CLIENT_A
new file mode 100644
index 0000000..bfbb279
--- /dev/null
+++ b/fai/config/debconf/CLIENT_A
@@ -0,0 +1,2 @@
+nullmailer nullmailer/adminaddr string postmaster at mail.intern
+nullmailer nullmailer/relayhost string mail.intern smtp --starttls --insecure
diff --git a/fai/config/debconf/DISKLESS_CLIENT b/fai/config/debconf/DISKLESS_CLIENT
index bfdbf93..d2a4f8e 100644
--- a/fai/config/debconf/DISKLESS_CLIENT
+++ b/fai/config/debconf/DISKLESS_CLIENT
@@ -1,5 +1,4 @@
 passwd passwd/shadow boolean true
-exim4-config exim4/dc_eximconfig_configtype select local delivery only; not on a network
 locales locales/default_environment_locale select en_US.UTF-8
 locales locales/locales_to_be_generated multiselect en_US.UTF-8 UTF-8
 xserver-xorg xserver-xorg/config/inputdevice/keyboard/model string pc105
diff --git a/fai/config/files/etc/icinga/objects/hosts.cfg/LOG_SERVER b/fai/config/files/etc/icinga/objects/hosts.cfg/LOG_SERVER
index 9fe934b..1495e20 100644
--- a/fai/config/files/etc/icinga/objects/hosts.cfg/LOG_SERVER
+++ b/fai/config/files/etc/icinga/objects/hosts.cfg/LOG_SERVER
@@ -5,8 +5,8 @@ define host{
 }
 
 define host{
-        use           generic-host
-        host_name     workstation00
-        hostgroups    workstation
+        use                    generic-host
+        host_name              workstation00
+        hostgroups             workstation
+        notifications_enabled  0
 }
-
diff --git a/fai/config/files/usr/local/sbin/debian-lan/SERVER_A b/fai/config/files/usr/local/sbin/debian-lan/SERVER_A
index 4dedf5a..7e0f6eb 100755
--- a/fai/config/files/usr/local/sbin/debian-lan/SERVER_A
+++ b/fai/config/files/usr/local/sbin/debian-lan/SERVER_A
@@ -107,9 +107,10 @@ EOF
     if ! grep -sq ${MACHINE} $CONF ; then
         cat >> $CONF <<EOF
 define host{
-        use           generic-host
-        host_name     ${MACHINE}
-        hostgroups    ${MACHINE%%[0-9]*}
+        use                    generic-host
+        host_name              ${MACHINE}
+        hostgroups             ${MACHINE%%[0-9]*}
+        notifications_enabled  0
 }
 
 EOF
diff --git a/fai/config/scripts/MAIL_SERVER/10-exim b/fai/config/scripts/MAIL_SERVER/10-exim
index 99d4189..488a2e3 100755
--- a/fai/config/scripts/MAIL_SERVER/10-exim
+++ b/fai/config/scripts/MAIL_SERVER/10-exim
@@ -27,10 +27,11 @@ editfiles:
 
       { ${target}/etc/exim4/conf.d/acl/30_exim4-config_check_rcpt
 	  BeginGroupIfNoSuchLine "  # Compare sender and kerberos ticket:"
-	    LocateLineMatching "acl_check_rcpt:"
-	    InsertLine ""
+	    LocateLineMatching "  # Deny unless the sender address can be verified."
 	    InsertLine "  # Compare sender and kerberos ticket:"
-	    InsertLine "  deny condition = $(dollar){if eq{$authenticated_id}{$sender_address_local_part at INTERN}{false}{true}}"
-	    InsertLine "    message = Sender address $sender_address conflicts with authentication $authenticated_id."
+	    InsertLine "  deny"
+	    InsertLine "    condition = $(dollar){if eq{$authenticated_id}{$sender_address_local_part at INTERN}{false}{true}}"
+	    InsertLine "    message = Not authenticated or sender address $sender_address in conflict with authentication $authenticated_id"
+	    InsertLine ""
 	  EndGroup
       }

-- 
Debian-LAN development and packaging