Some possible fixes for debian-edu-config

[Petter Reinholdtsen <pere@hungry.com>]

Here are some fixes that might be considered for Lenny, and which
should definitely go into Squeeze.

This one make sure /etc/environment and /etc/apt/apt.conf is readable
by everyone, even if it is created by update-proxy-from-wpad.  I
suspect this would fix a problem with DVD installs and network
installs not using a proxy, but have not verified it.

Index: share/debian-edu-config/tools/update-proxy-from-wpad
===================================================================
--- share/debian-edu-config/tools/update-proxy-from-wpad        (revision 62355)
+++ share/debian-edu-config/tools/update-proxy-from-wpad        (working copy)
@@ -56,6 +56,7 @@
     # extracted from the WPAD file
     file=/etc/environment
     touch $file
+    chmod a+r $file
     sed -e "s%^http_proxy=.*%http_proxy=$http_proxy%" \
        -e "s%^ftp_proxy=.*%ftp_proxy=$http_proxy%" \
        < $file > $file.new && chmod a+r $file.new
@@ -74,6 +75,7 @@
     # used during installation, so we update this file.
     file=/etc/apt/apt.conf
     touch $file
+    chmod a+r $file
     sed -e "s%^Acquire::http::Proxy .*%Acquire::http::Proxy \"$http_proxy\";%" \
        -e "s%^Acquire::ftp::Proxy .*%Acquire::ftp::Proxy \"$ftp_proxy\";%" \
            < $file > $file.new && chmod a+r $file.new

This one make sure the wrappers created will work also if the user
calling them have the wrapper environment variable set and neither
pulseaudio-utils nor esound-clients installed.  It also document where
the wrapper binaries come from, to allow those reading the wrapper
code to figure it out.

Index: sbin/debian-edu-ltsp-audiodivert
===================================================================
--- sbin/debian-edu-ltsp-audiodivert    (revision 62355)
+++ sbin/debian-edu-ltsp-audiodivert    (working copy)
@@ -14,11 +14,13 @@
        if [ -x "$cmd" ] && [ ! -x "$cmd.ltsp" ] ; then
            cat <<EOF > "$cmd.ltsp"
 #!/bin/sh
+wrapper=""
 if [ "\$LTSP_CLIENT" ] ; then
     if [ "\$PULSE_SERVER" ] && [ -x /usr/bin/padsp ] ; then
-        # Pulseaudio
+        # PulseAudio using padsp from pulseaudio-utils
         wrapper=padsp
     elif [ "\$ESPEAKER" ] && [ -x /usr/bin/esddsp ] ; then
+        # ESD using espdsp from esound-clients
         wrapper=espdsp
     fi
 fi

This one solve a minor init.d script ordering, making sure
fetch-ldap-cert start after slapd is available, should it need to
fetch it from the local host (Also reported to #566973).

Index: debian/debian-edu-config.fetch-ldap-cert
===================================================================
--- debian/debian-edu-config.fetch-ldap-cert    (revision 62355)
+++ debian/debian-edu-config.fetch-ldap-cert    (working copy)
@@ -3,8 +3,7 @@
 # Provides:          fetch-ldap-cert
 # Required-Start:    $local_fs $remote_fs
 # Required-Stop:     $local_fs $remote_fs
-# Should-Start:      $network $syslog apache apache2
-# Should-Stop:       $network $syslog apache apache2
+# Should-Start:      $network $syslog slapd
 # Default-Start:     2 3 4 5
 # Default-Stop:
 # Short-Description: Fetch LDAP SSL public key from the server

Happy hacking,
-- 
Petter Reinholdtsen