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

[Andreas B. Mundt]

The following commit has been merged in the master branch:
commit c034992514f71f4bb411f40004b4d9049def0ced
Author: Andreas B. Mundt <andi at debian.org>
Date:   Sun Feb 10 12:01:15 2013 +0100

    Cleanup and minor fixes.
    
    Enable diskless machines by default as this is the most tested setup.
    Revert authz-regexp in 'slapd.conf' and keep the authz-regexp for SASL
    as comment for reference.
    Improve 'CONVERT'-detection.  Make sure only CONVERT=true switches on
    conversion, not any non-empty string.
    Switch to nullmailer for diskless machines too.

diff --git a/fai/config/class/50-host-classes b/fai/config/class/50-host-classes
index 516bb89..7813a8f 100755
--- a/fai/config/class/50-host-classes
+++ b/fai/config/class/50-host-classes
@@ -30,11 +30,11 @@
 ##
 
 ## Choose your mainserver setting:
-FLAVOR="LVM7_A"  ## default for ease of testing in a vm
+#FLAVOR="LVM7_A"  ## simple setup for testing in a vm
 #FLAVOR="LVM6BAK_A"  ## backup disk
 #FLAVOR="RAIDLVM7_A RAID"  ## RAID1
 #FLAVOR="RAIDLVM6BAK_A RAID"  ## RAID1, backup disk
-#FLAVOR="LVM8_A DISKLESS_SERVER"  ## diskless
+FLAVOR="LVM8_A DISKLESS_SERVER"  ## simple diskless, default for testing in a vm
 #FLAVOR="LVM7BAK_A DISKLESS_SERVER"  ## diskless, backup disk
 #FLAVOR="RAIDLVM8_A RAID DISKLESS_SERVER"  ## diskless, RAID1
 #FLAVOR="RAIDLVM7BAK_A RAID DISKLESS_SERVER"  ## diskless, RAID1, backup disk
diff --git a/fai/config/files/etc/ldap/slapd.conf/GOSA b/fai/config/files/etc/ldap/slapd.conf/GOSA
index f823dda..f6b66d4 100644
--- a/fai/config/files/etc/ldap/slapd.conf/GOSA
+++ b/fai/config/files/etc/ldap/slapd.conf/GOSA
@@ -108,9 +108,13 @@ lastmod         on
 checkpoint      512 30
 
 ## map authentication via gssapi on user dn:
-authz-regexp "uid=([^,]*),cn=intern,cn=gssapi,cn=auth"
+authz-regexp "uid=([^,]*),cn=gssapi,cn=auth"
         "ldap:///dc=intern??sub?(uid=$1)"
 
+## map authentication via sasl on user dn:
+#authz-regexp "uid=([^,]*),cn=intern,cn=gssapi,cn=auth"
+#        "ldap:///dc=intern??sub?(uid=$1)"
+
 ################# GOsa access ###################
 access to dn.subtree="ou=gosa,dc=intern"
        by dn.exact="cn=gosa,ou=gosa,dc=intern" manage
diff --git a/fai/config/hooks/instsoft.SERVER_A.source b/fai/config/hooks/instsoft.SERVER_A.source
index 30542e4..adbed57 100755
--- a/fai/config/hooks/instsoft.SERVER_A.source
+++ b/fai/config/hooks/instsoft.SERVER_A.source
@@ -7,7 +7,7 @@
 POLICYFILE="/usr/sbin/policy-rc.d"
 
 ## Only when converting:
-if $CONVERT && [ "$target" == "/" ] && [ ! -e $POLICYFILE ] ; then
+if [ "$CONVERT" == "true" ] && [ "$target" == "/" ] && [ ! -e $POLICYFILE ] ; then
     cat > $POLICYFILE <<EOF
 #!/bin/sh
 exit 101
diff --git a/fai/config/package_config/DISKLESS_CLIENT b/fai/config/package_config/DISKLESS_CLIENT
index 34f0be1..85998b3 100644
--- a/fai/config/package_config/DISKLESS_CLIENT
+++ b/fai/config/package_config/DISKLESS_CLIENT
@@ -50,7 +50,7 @@ openssh-client
 strace
 time
 procinfo
-exim4
+nullmailer
 eject
 locales
 console-common
diff --git a/fai/config/scripts/LOG_SERVER/10-rsyslog_icinga.conf b/fai/config/scripts/LOG_SERVER/10-rsyslog_icinga.conf
index 5c343d3..6c754ab 100755
--- a/fai/config/scripts/LOG_SERVER/10-rsyslog_icinga.conf
+++ b/fai/config/scripts/LOG_SERVER/10-rsyslog_icinga.conf
@@ -10,7 +10,7 @@ fcopy /etc/icinga/objects/hostgroups_icinga.cfg
 fcopy /etc/icinga/objects/services_icinga.cfg
 fcopy /etc/icinga/objects/commands.cfg
 
-if [ "$FAI_ACTION" == "install" ] || $CONVERT ; then
+if [ "$FAI_ACTION" == "install" ] || [ "$CONVERT" == "true" ] ; then
     ## Machines are added here, so do not overwrite them on softupdate:
     fcopy /etc/icinga/objects/hosts.cfg
     mv $target/etc/icinga/objects/localhost_icinga.cfg $target/etc/icinga/objects/localhost_icinga.cfg_orig
diff --git a/fai/config/scripts/SERVER_A/10-misc b/fai/config/scripts/SERVER_A/10-misc
index 9607ffe..97b7842 100755
--- a/fai/config/scripts/SERVER_A/10-misc
+++ b/fai/config/scripts/SERVER_A/10-misc
@@ -31,7 +31,7 @@ fi
 fcopy -m root,root,0700 /usr/local/sbin/debian-lan
 fcopy -m root,root,0700 /usr/local/sbin/dhcpd-keytab
 
-if [ "$FAI_ACTION" != "install" ] && ! $CONVERT ; then
+if [ "$FAI_ACTION" != "install" ] && [ "$CONVERT" != "true" ] ; then
     exit 0
 fi
 

-- 
Debian-LAN development and packaging