[debian-edu-commits] r79609 - in branches/wheezy/debian-edu-config: . debian etc/gosa share/ltsp/init-ltsp.d

[schweer-guest at alioth.debian.org]

Author: schweer-guest
Date: 2013-04-16 19:45:20 +0000 (Tue, 16 Apr 2013)
New Revision: 79609

Added:
   branches/wheezy/debian-edu-config/share/ltsp/init-ltsp.d/60-edu-diskless_ws
Removed:
   branches/wheezy/debian-edu-config/share/ltsp/init-ltsp.d/60-edu-nsswitch
Modified:
   branches/wheezy/debian-edu-config/Makefile
   branches/wheezy/debian-edu-config/debian/changelog
   branches/wheezy/debian-edu-config/etc/gosa/gosa.conf
Log:
* Set debug level back to '0' in gosa.conf.
* Make diskless workstations comply with ltsp 5.4.2-6:
  - Remove 60-edu-nsswitch.conf
  - Add 60-edu-diskless-ws, to change /etc/nsswitch and enable services
    (autofs, nfs-common, nscd, nslcd) disabled by LTSP.
* Edit Makefile to reflect the changes.

Modified: branches/wheezy/debian-edu-config/Makefile
===================================================================
--- branches/wheezy/debian-edu-config/Makefile	2013-04-15 22:03:10 UTC (rev 79608)
+++ branches/wheezy/debian-edu-config/Makefile	2013-04-16 19:45:20 UTC (rev 79609)
@@ -380,7 +380,7 @@
 		share/debian-edu-config/tools/wpad-extract \
 		share/debian-edu-config/ltspfs-mounter-kde \
 		share/ltsp/get-ldap-ltsp-config \
-		share/ltsp/init-ltsp.d/60-edu-nsswitch \
+		share/ltsp/init-ltsp.d/60-edu-diskless-ws \
 		share/ltsp/init-ltsp.d/70-edu-client-core \
 		share/initramfs-tools/scripts/nfs-bottom/before-ltsp \
 	; do \

Modified: branches/wheezy/debian-edu-config/debian/changelog
===================================================================
--- branches/wheezy/debian-edu-config/debian/changelog	2013-04-15 22:03:10 UTC (rev 79608)
+++ branches/wheezy/debian-edu-config/debian/changelog	2013-04-16 19:45:20 UTC (rev 79609)
@@ -12,6 +12,12 @@
     - Add sambaAccount restrictions to jradmin-role acl in
       ldap-bootstrap/gosa.ldif.
     - Change description of admin-role to document restrictions.
+  * Set debug level back to '0' in gosa.conf.
+  * Make diskless workstations comply with ltsp 5.4.2-6:
+    - Remove 60-edu-nsswitch.conf
+    - Add 60-edu-diskless-ws, to change /etc/nsswitch and enable services
+      (autofs, nfs-common, nscd, nslcd) disabled by LTSP.
+  * Edit Makefile to reflect the changes.
 
  -- Wolfgang Schweer <wschweer at arcor.de>  Mon, 15 Apr 2013 21:18:36 +0200
 

Modified: branches/wheezy/debian-edu-config/etc/gosa/gosa.conf
===================================================================
--- branches/wheezy/debian-edu-config/etc/gosa/gosa.conf	2013-04-15 22:03:10 UTC (rev 79608)
+++ branches/wheezy/debian-edu-config/etc/gosa/gosa.conf	2013-04-16 19:45:20 UTC (rev 79609)
@@ -177,7 +177,7 @@
         theme="default"
         sessionLifetime="7200"
         templateCompileDirectory="/var/spool/gosa"
-        debugLevel="3"
+        debugLevel="0"
         passwordMinLength="5"
         passwordMinDiffer="2"
         passwordHook=""

Added: branches/wheezy/debian-edu-config/share/ltsp/init-ltsp.d/60-edu-diskless_ws
===================================================================
--- branches/wheezy/debian-edu-config/share/ltsp/init-ltsp.d/60-edu-diskless_ws	                        (rev 0)
+++ branches/wheezy/debian-edu-config/share/ltsp/init-ltsp.d/60-edu-diskless_ws	2013-04-16 19:45:20 UTC (rev 79609)
@@ -0,0 +1,10 @@
+# For Debian Edu diskless workstations (i.e. ltsp fat clients).
+# As dns service is available, modify priority to make KERBEROS work.
+if boolean_is_true "$LTSP_FATCLIENT"; then
+    sed -i '/automount/ s/files\ ldap/ldap/' /etc/nsswitch.conf
+    sed -i s/files\ myhostname\ dns/dns\ files/ /etc/nsswitch.conf
+    # Enable services.
+    for service in autofs nfs-common nslcd nscd ; do
+        update-rc.d $service enable 2
+    done
+fi

Deleted: branches/wheezy/debian-edu-config/share/ltsp/init-ltsp.d/60-edu-nsswitch
===================================================================
--- branches/wheezy/debian-edu-config/share/ltsp/init-ltsp.d/60-edu-nsswitch	2013-04-15 22:03:10 UTC (rev 79608)
+++ branches/wheezy/debian-edu-config/share/ltsp/init-ltsp.d/60-edu-nsswitch	2013-04-16 19:45:20 UTC (rev 79609)
@@ -1,7 +0,0 @@
-# For Debian Edu diskless workstations (i.e. ltsp fat clients).
-# As dns service is available, modify priority to make KERBEROS work.
-if boolean_is_true "$LTSP_FATCLIENT"; then
-    sed -i s/compat/ldap\ compat/ /etc/nsswitch.conf
-    sed -i s/files\ my/dns\ files\ my/ /etc/nsswitch.conf
-    sed  -i s/netgroups:\ *files/netgroups:\ \ \ \ \ \ ldap\ files/ nsswitch.conf
-fi