[debian-lan-devel] [SCM] Debian-LAN development and packaging branch, master, updated. debian/0.10-7-g91e08ce

[Andreas B. Mundt]

The following commit has been merged in the master branch:
commit 91e08ce3a2184e693bb7ac2c956ff25592b9fb3a
Author: Andreas B. Mundt <andi at debian.org>
Date:   Mon May 20 08:50:10 2013 +0200

    Small fixes and improvements.
    
    Remove all mount options that are outdated or defaults.
    Add some packages to the EDU class.
    Do not recommend dots in user names (cf. NAME_REGEX in
    '/etc/adduser.conf').
    Iceweasel:  Switch off caching over the network.

diff --git a/fai/config/files/etc/ldap/autofs.ldif/SERVER_A b/fai/config/files/etc/ldap/autofs.ldif/SERVER_A
index bcbc686..6d877f1 100644
--- a/fai/config/files/etc/ldap/autofs.ldif/SERVER_A
+++ b/fai/config/files/etc/ldap/autofs.ldif/SERVER_A
@@ -39,4 +39,4 @@ ou: auto.mainserver
 dn: cn=/,ou=auto.mainserver,ou=automount,dc=intern
 objectClass: automount
 cn: /
-automountInformation: -fstype=nfs4,sec=krb5i,tcp,rsize=32768,wsize=32768,rw,intr,hard,nodev,nosuid mainserver.intern:/&
+automountInformation: -fstype=nfs4,sec=krb5i,nodev,nosuid mainserver.intern:/&
diff --git a/fai/config/files/usr/local/sbin/add2gosa/GOSA b/fai/config/files/usr/local/sbin/add2gosa/GOSA
index 0bc922c..a672225 100755
--- a/fai/config/files/usr/local/sbin/add2gosa/GOSA
+++ b/fai/config/files/usr/local/sbin/add2gosa/GOSA
@@ -19,7 +19,7 @@ mk_uname() {
     GNAME=${1,,}
     FNAME=${2,,}
     echo ${GNAME::4}${FNAME::4}
-    #echo ${GNAME}.${FNAME}
+    #echo ${GNAME}_${FNAME}
 }
 
 ou2LDAP() {
diff --git a/fai/config/package_config/EDU b/fai/config/package_config/EDU
index 4f15d58..eb38ad5 100644
--- a/fai/config/package_config/EDU
+++ b/fai/config/package_config/EDU
@@ -16,10 +16,12 @@ klavaro
 stellarium
 geogebra
 arduino
-#fritzing
+fritzing
 scribus
 audacity
 viking
+gvrng
+scratch
 
 ## High school (consider also the DEVTOOLS class):
 octave3.2
diff --git a/fai/config/scripts/CLIENT_A/20-misc b/fai/config/scripts/CLIENT_A/20-misc
index 7cd7aa5..4b6a3f5 100755
--- a/fai/config/scripts/CLIENT_A/20-misc
+++ b/fai/config/scripts/CLIENT_A/20-misc
@@ -28,3 +28,9 @@ ainsl /etc/iceweasel/pref/iceweasel.js 'pref("network.negotiate-auth.trusted-uri
 
 ## Default Homepage:
 ainsl /etc/iceweasel/pref/iceweasel.js 'pref("browser.startup.homepage", "data:text/plain,browser.startup.homepage=http://www.intern");'
+
+## Switch off caching over the network:
+ainsl /etc/iceweasel/pref/iceweasel.js 'pref("browser.cache.disk.enable", false);'
+ainsl /etc/iceweasel/pref/iceweasel.js 'pref("browser.cache.offline.enable", false);'
+#ainsl /etc/iceweasel/pref/iceweasel.js 'pref("browser.safebrowsing.enabled", false);'
+#ainsl /etc/iceweasel/pref/iceweasel.js 'pref("browser.safebrowsing.malware.enabled", false);'
diff --git a/fai/config/scripts/NFS_SERVER/10-config b/fai/config/scripts/NFS_SERVER/10-config
index ec2b301..109adf5 100755
--- a/fai/config/scripts/NFS_SERVER/10-config
+++ b/fai/config/scripts/NFS_SERVER/10-config
@@ -26,8 +26,8 @@ editfiles:
 
 	{ ${target}/etc/exports
 	  ## kerberized NFS4:
-	  AppendIfNoSuchLine "/srv/nfs4         ${SUBNETMASK}(sec=krb5p:krb5i,rw,sync,fsid=0,crossmnt,no_subtree_check)"
-	  AppendIfNoSuchLine "/srv/nfs4/home0   ${SUBNETMASK}(sec=krb5p:krb5i,rw,sync,no_subtree_check)"
+	  AppendIfNoSuchLine "/srv/nfs4         ${SUBNETMASK}(sec=krb5p:krb5i,rw,fsid=0,crossmnt,no_subtree_check)"
+	  AppendIfNoSuchLine "/srv/nfs4/home0   ${SUBNETMASK}(sec=krb5p:krb5i,rw,no_subtree_check)"
 	}
 
 	{ ${target}/etc/fstab

-- 
Debian-LAN development and packaging