[debian-lan-devel] [debian-lan] 01/03: Fixes: Default desktop, squid as package proxy, ldapscripts.

[Andreas B. Mundt]

This is an automated email from the git hooks/post-receive script.

andi pushed a commit to branch master
in repository debian-lan.

commit 8dffe0a0229fe61998d62febf3763fff52310a0d
Author: Andreas B. Mundt <andi at debian.org>
Date:   Wed Nov 27 21:44:23 2013 +0100

    Fixes:  Default desktop, squid as package proxy, ldapscripts.
    
    Allow access to squid even if dansguardian is used.  This is needed to
    use squid as APT package cache.  Access from client browsers has to be
    disabled on the clients if necessary.
---
 fai/config/scripts/DESKTOP/20-default-desktop | 2 +-
 fai/config/scripts/PROXY/30-dansguardian      | 4 ++--
 fai/config/scripts/SERVER_A/20-ldapscripts    | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/fai/config/scripts/DESKTOP/20-default-desktop b/fai/config/scripts/DESKTOP/20-default-desktop
index a34be7c..e97730c 100755
--- a/fai/config/scripts/DESKTOP/20-default-desktop
+++ b/fai/config/scripts/DESKTOP/20-default-desktop
@@ -3,4 +3,4 @@
 ## Choose the default desktop:
 
 #$ROOTCMD update-alternatives --set x-session-manager /usr/bin/startlxde
-$ROOTCMD update-alternatives --set x-session-manager /usr/bin/startxfce4
+$ROOTCMD update-alternatives --set x-session-manager /usr/bin/xfce4-session
diff --git a/fai/config/scripts/PROXY/30-dansguardian b/fai/config/scripts/PROXY/30-dansguardian
index 5bc6431..b5e443a 100755
--- a/fai/config/scripts/PROXY/30-dansguardian
+++ b/fai/config/scripts/PROXY/30-dansguardian
@@ -6,6 +6,6 @@ set -e
 if $ROOTCMD which dansguardian > /dev/null ; then
     ## enable dansguardian:
     sed -i "s/^UNCONFIGURED/\# Line commented by FAI.  UNCONFIGURED/"  ${target}/etc/dansguardian/dansguardian.conf
-    ## disable access to squid from the network:
-    sed -i "/^http_access allow localnet$/d" ${target}/etc/squid3/squid.conf
+    ## disable access to squid from the network (commented, access needed for APT):
+    #sed -i "/^http_access allow localnet$/d" ${target}/etc/squid3/squid.conf
 fi
diff --git a/fai/config/scripts/SERVER_A/20-ldapscripts b/fai/config/scripts/SERVER_A/20-ldapscripts
index 99c58d9..9e5078b 100755
--- a/fai/config/scripts/SERVER_A/20-ldapscripts
+++ b/fai/config/scripts/SERVER_A/20-ldapscripts
@@ -9,7 +9,7 @@ editfiles:
    any::
 	{ ${target}/etc/ldapscripts/ldapscripts.conf
 	  ReplaceAll '#SERVER="ldap://localhost"' With 'SERVER="ldapi://"'
-	  ReplaceAll '#BINDDN="cn=Manager,dc=example,dc=com"' With 'BINDDN="cn=admin,dc=intern"'
+	  ReplaceAll 'BINDDN="cn=Manager,dc=example,dc=com"' With 'BINDDN="cn=admin,dc=intern"'
 	  ReplaceAll '#BINDPWDFILE=' With 'BINDPWDFILE='
 
 	  ReplaceAll '#SUFFIX="dc=example,dc=com"' With 'SUFFIX="dc=intern"'

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/collab-maint/debian-lan.git