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

[Andreas B. Mundt]

The following commit has been merged in the master branch:
commit 963f92d3798648222e670247a1567595c03771cb
Author: Andreas B. Mundt <andi at debian.org>
Date:   Tue Feb 12 12:27:35 2013 +0100

    Cleanup and minor fixes.
    
    Disable nagios' check_disk for non-local devices.
    Distribute add2gosa with class GOSA.
    Make starting web page available.
    Add gnome-session-fallback to make gnome fallback work.

diff --git a/fai/config/files/etc/nagios/nrpe.d/debian-lan.cfg/LOG_CLIENT b/fai/config/files/etc/nagios/nrpe.d/debian-lan.cfg/LOG_CLIENT
index b470cc2..403a633 100644
--- a/fai/config/files/etc/nagios/nrpe.d/debian-lan.cfg/LOG_CLIENT
+++ b/fai/config/files/etc/nagios/nrpe.d/debian-lan.cfg/LOG_CLIENT
@@ -5,7 +5,7 @@ command[check_apt]=/usr/lib/nagios/plugins/check_apt
 command[debian-lan_check_ntp_time]=/usr/lib/nagios/plugins/check_ntp_time -H ntp -w 0.5 -c 1
 command[debian-lan_check_procs]=/usr/lib/nagios/plugins/check_procs -w '150' -c '200'
 command[debian-lan_check_procs_zombie]=/usr/lib/nagios/plugins/check_procs -w '5' -c '10' -s Z
-command[debian-lan_check_all_disks]=/usr/lib/nagios/plugins/check_disk -w '20%' -c '10%' -e
+command[debian-lan_check_all_disks]=/usr/lib/nagios/plugins/check_disk -w '20%' -c '10%' -e -l
 command[debian-lan_check_swap]=/usr/lib/nagios/plugins/check_swap -w '50%' -c '30%'
 command[debian-lan_check_load]=/usr/lib/nagios/plugins/check_load --warning='5.0,4.0,3.0' --critical='10.0,6.0,4.0'
 command[debian-lan_check_users]=/usr/lib/nagios/plugins/check_users -w '5' -c '10'
diff --git a/fai/config/package_config/DESKTOP b/fai/config/package_config/DESKTOP
index 13ad6f5..76a4736 100644
--- a/fai/config/package_config/DESKTOP
+++ b/fai/config/package_config/DESKTOP
@@ -5,6 +5,7 @@ lxde
 lxtask
 desktop-base
 gnome-session
+gnome-session-fallback
 gnome-applets
 xfce4
 
diff --git a/fai/config/package_config/DISKLESS_CLIENT b/fai/config/package_config/DISKLESS_CLIENT
index 85998b3..8fdcccd 100644
--- a/fai/config/package_config/DISKLESS_CLIENT
+++ b/fai/config/package_config/DISKLESS_CLIENT
@@ -7,6 +7,7 @@ lxde
 lxtask
 desktop-base
 gnome-session
+gnome-session-fallback
 gnome-applets
 xfce4
 
diff --git a/fai/config/scripts/GOSA/10-config b/fai/config/scripts/GOSA/10-config
index 013bb6f..2d6b1dc 100755
--- a/fai/config/scripts/GOSA/10-config
+++ b/fai/config/scripts/GOSA/10-config
@@ -13,6 +13,9 @@ fcopy -m root,www-data,0660 $GOSACONF
 fcopy -m root,root,0770 /usr/local/sbin/gosa-create
 fcopy -m root,root,0770 /usr/local/sbin/gosa-sync
 fcopy -m root,root,0770 /usr/local/sbin/gosa-remove
+fcopy -m root,root,0770 /usr/local/sbin/add2gosa
+
+fcopy /var/www/index.html
 
 ## Insert password:
 PWFILE="$DATADIR/LDAPadminPWD"
diff --git a/fai/config/scripts/SERVER_A/10-misc b/fai/config/scripts/SERVER_A/10-misc
index d4a89cd..c152b9b 100755
--- a/fai/config/scripts/SERVER_A/10-misc
+++ b/fai/config/scripts/SERVER_A/10-misc
@@ -31,10 +31,6 @@ fi
 fcopy -m root,root,0700 /usr/local/sbin/debian-lan
 fcopy -m root,root,0700 /usr/local/sbin/dhcpd-keytab
 
-if ifclass GOSA ; then
-    fcopy -m root,root,0700 /usr/local/sbin/add2gosa
-fi
-
 
 if [ "$FAI_ACTION" != "install" ] && [ "$CONVERT" != "true" ] ; then
     exit 0

-- 
Debian-LAN development and packaging