[debian-edu-commits] r79601 - in branches/wheezy/debian-edu-config: debian ldap-bootstrap

[schweer-guest at alioth.debian.org]

Author: schweer-guest
Date: 2013-04-09 18:04:02 +0000 (Tue, 09 Apr 2013)
New Revision: 79601

Modified:
   branches/wheezy/debian-edu-config/debian/changelog
   branches/wheezy/debian-edu-config/ldap-bootstrap/gosa-server.ldif
   branches/wheezy/debian-edu-config/ldap-bootstrap/root.ldif
Log:
* Enable more types to choose from when adding systems:
  - Remove restriction from acl in root.ldif to provide non locked system
    type 'server'.
  - Add GOsa object classes goNtpServer and goLdapServer for tjener entry
    in gosa-server.ldif, required if adding systems of type workstation.
  - Add description for tjener in gosa-server.ldif including a warning.
    (Though the object tjener is still locked by default, it could be set
    to 'active' and then be modified.) (Closes: #629367).

Modified: branches/wheezy/debian-edu-config/debian/changelog
===================================================================
--- branches/wheezy/debian-edu-config/debian/changelog	2013-04-08 16:46:35 UTC (rev 79600)
+++ branches/wheezy/debian-edu-config/debian/changelog	2013-04-09 18:04:02 UTC (rev 79601)
@@ -27,6 +27,14 @@
     - Remove line SCREEN_07=ldm from ltsp.ldif, cause this is now done
       during the init-ltsp process.
   * 70-edu-client-core: Edit ltsp-client-core without using line dependency.
+  * Enable more types to choose from when adding systems:
+    - Remove restriction from acl in root.ldif to provide non locked system
+      type 'server'.
+    - Add GOsa object classes goNtpServer and goLdapServer for tjener entry
+      in gosa-server.ldif, required if adding systems of type workstation.
+    - Add description for tjener in gosa-server.ldif including a warning.
+      (Though the object tjener is still locked by default, it could be set
+      to 'active' and then be modified.) (Closes: #629367).
 
  -- Mike Gabriel <sunweaver at debian.org>  Mon, 01 Apr 2013 15:26:19 +0200
 

Modified: branches/wheezy/debian-edu-config/ldap-bootstrap/gosa-server.ldif
===================================================================
--- branches/wheezy/debian-edu-config/ldap-bootstrap/gosa-server.ldif	2013-04-08 16:46:35 UTC (rev 79600)
+++ branches/wheezy/debian-edu-config/ldap-bootstrap/gosa-server.ldif	2013-04-09 18:04:02 UTC (rev 79601)
@@ -6,12 +6,16 @@
 
 dn: cn=tjener,ou=servers,ou=systems,dc=skole,dc=skolelinux,dc=no
 macAddress: $MAC
+description: Main server; modify only if 100% sure.
 objectClass: top
 objectClass: GOhard
 objectClass: goServer
 objectClass: dhcpServer
+objectClass: goNtpServer
+objectClass: goLdapServer
 cn: tjener
 dhcpServiceDN: cn=dhcp,cn=tjener,ou=servers,ou=systems,dc=skole,dc=skolelinux,dc=no
+goLdapBase: ldap://tjener:389/dc=skole,dc=skolelinux,dc=no
 ipHostNumber: 10.0.2.2
 gotoMode: locked
 

Modified: branches/wheezy/debian-edu-config/ldap-bootstrap/root.ldif
===================================================================
--- branches/wheezy/debian-edu-config/ldap-bootstrap/root.ldif	2013-04-08 16:46:35 UTC (rev 79600)
+++ branches/wheezy/debian-edu-config/ldap-bootstrap/root.ldif	2013-04-09 18:04:02 UTC (rev 79601)
@@ -29,7 +29,7 @@
 ou: skole
 o: skole.skolelinux.no
 labeledURI: http://www/ LDAP for Debian Edu/Skolelinux
-gosaAclEntry: 0:psub:$GOSAADMINSDN64:server/servgeneric;#gotoMode;r#userPassword;r#FAIstate;r,all;cmdrw
+gosaAclEntry: 0:psub:$GOSAADMINSDN64:all;cmdrw
 gosaAclEntry: 1:psub:$TEACHERSDN64:users/user;r
 gosaAclEntry: 2:psub:Kg==:users/user;sr#personalTitle;w#academicTitle;w#dateOfBirth;w#gender;w#preferredLanguage;w#userPicture;w#homePostalAddress;w#homePhone;w#labeledURI;w,users/password;srw
 gosaAclEntry: 3:role:$ADMINROLEDN64: