[debian-edu-commits] r78767 - branches/wheezy/debian-edu-config/etc/gosa

schweer-guest at alioth.debian.org schweer-guest at alioth.debian.org
Wed Jan 16 20:20:06 UTC 2013


Author: schweer-guest
Date: 2013-01-16 20:20:06 +0000 (Wed, 16 Jan 2013)
New Revision: 78767

Modified:
   branches/wheezy/debian-edu-config/etc/gosa/gosa.conf
Log:
Reformat content to be compatible with ldap-debian-edu-install.


Modified: branches/wheezy/debian-edu-config/etc/gosa/gosa.conf
===================================================================
--- branches/wheezy/debian-edu-config/etc/gosa/gosa.conf	2013-01-16 20:18:49 UTC (rev 78766)
+++ branches/wheezy/debian-edu-config/etc/gosa/gosa.conf	2013-01-16 20:20:06 UTC (rev 78767)
@@ -37,7 +37,9 @@
 
       <!-- This long ACL list is required to exclude the users menu entry when only 
             'viewFaxEntries' permissions are set -->
-      <plugin acl="users/netatalk,users/environment,users/posixAccount,users/kolabAccount,users/phpscheduleitAccount,users/oxchangeAccount,users/proxyAccount,users/connectivity,users/pureftpdAccount,users/phpgwAccount,users/opengwAccount,users/pptpAccount,users/intranetAccount,users/webdavAccount,users/nagiosAccount,users/sambaAccount,users/groupware,users/mailAccount,users/user,users/scalixAccount,users/password,users/gofaxAccount,users/phoneAccount,users/Groupware" class="userManagement" postmodify="USERPASSWORD=%userPassword /usr/bin/sudo /usr/share/debian-edu-config/tools/gosa-sync %dn" />
+      <plugin acl="users/netatalk,users/environment,users/posixAccount,users/kolabAccount,users/phpscheduleitAccount,users/oxchangeAccount,users/proxyAccount,users/connectivity,users/pureftpdAccount,users/phpgwAccount,users/opengwAccount,users/pptpAccount,users/intranetAccount,users/webdavAccount,users/nagiosAccount,users/sambaAccount,users/groupware,users/mailAccount,users/user,users/scalixAccount,users/password,users/gofaxAccount,users/phoneAccount,users/Groupware" 
+              class="userManagement" 
+              postmodify="USERPASSWORD=%userPassword /usr/bin/sudo /usr/share/debian-edu-config/tools/gosa-sync %dn" />
       <plugin acl="groups" class="groupManagement" />
       <plugin acl="roles" class="roleManagement"/>
       <plugin acl="acl"  class="aclManagement" />
@@ -106,7 +108,9 @@
   <!-- User dialog -->
   <usertabs>
      <tab class="user" name="Generic" />
-     <tab class="posixAccount" name="POSIX" postcreate="/usr/bin/sudo /usr/share/debian-edu-config/tools/gosa-create %uid" postremove="/usr/bin/sudo /usr/share/debian-edu-config/tools/gosa-remove %uid %homeDirectory" />
+     <tab class="posixAccount" name="POSIX" 
+          postcreate="/usr/bin/sudo /usr/share/debian-edu-config/tools/gosa-create %uid" 
+          postremove="/usr/bin/sudo /usr/share/debian-edu-config/tools/gosa-remove %uid %homeDirectory" />
      <tab class="sambaAccount" name="Samba" />
      <tab class="netatalk" name="Netatalk" />
      <tab class="mailAccount" name="Mail" />
@@ -186,15 +190,21 @@
   </mimetabs>
 
   <devicetabs>
-    <tab class="deviceGeneric" name="Generic" postcreate="/usr/bin/sudo /usr/share/debian-edu-config/tools/gosa-sync-dns-nfs" postremove="/usr/bin/sudo /usr/share/debian-edu-config/tools/gosa-sync-dns-nfs" postmodify="/usr/bin/sudo /usr/share/debian-edu-config/tools/gosa-sync-dns-nfs"  />
+    <tab class="deviceGeneric" name="Generic" 
+         postcreate="/usr/bin/sudo /usr/share/debian-edu-config/tools/gosa-sync-dns-nfs" 
+         postremove="/usr/bin/sudo /usr/share/debian-edu-config/tools/gosa-sync-dns-nfs" 
+         postmodify="/usr/bin/sudo /usr/share/debian-edu-config/tools/gosa-sync-dns-nfs"  />
   </devicetabs>
 
   <arpnewdevicetabs>
-    <tab class="ArpNewDevice" name="Generic" postcreate="/usr/bin/sudo /usr/share/debian-edu-config/tools/gosa-sync-dns-nfs" postremove="/usr/bin/sudo /usr/share/debian-edu-config/tools/gosa-sync-dns-nfs" postmodify="/usr/bin/sudo /usr/share/debian-edu-config/tools/gosa-sync-dns-nfs"  />
+    <tab class="ArpNewDevice" name="Generic"  />
   </arpnewdevicetabs>
 
   <termtabs>
-     <tab class="termgeneric" name="Generic" postcreate="/usr/bin/sudo /usr/share/debian-edu-config/tools/gosa-sync-dns-nfs" postremove="/usr/bin/sudo /usr/share/debian-edu-config/tools/gosa-sync-dns-nfs" postmodify="/usr/bin/sudo /usr/share/debian-edu-config/tools/gosa-sync-dns-nfs"/>
+     <tab class="termgeneric" name="Generic" 
+          postcreate="/usr/bin/sudo /usr/share/debian-edu-config/tools/gosa-sync-dns-nfs" 
+          postremove="/usr/bin/sudo /usr/share/debian-edu-config/tools/gosa-sync-dns-nfs" 
+          postmodify="/usr/bin/sudo /usr/share/debian-edu-config/tools/gosa-sync-dns-nfs"/>
      <tab class="termstartup" name="Startup"/>
      <tab class="termservice" name="Devices"/>
      <tab class="terminfo" name="Information" snmpCommunity="goto"/>
@@ -202,7 +212,10 @@
   </termtabs>
 
   <servtabs>
-     <tab class="servgeneric" name="Generic" postcreate="/usr/bin/sudo /usr/share/debian-edu-config/tools/gosa-sync-dns-nfs" postremove="/usr/bin/sudo /usr/share/debian-edu-config/tools/gosa-sync-dns-nfs" postmodify="/usr/bin/sudo /usr/share/debian-edu-config/tools/gosa-sync-dns-nfs"/>
+     <tab class="servgeneric" name="Generic" 
+          postcreate="/usr/bin/sudo /usr/share/debian-edu-config/tools/gosa-sync-dns-nfs" 
+          postremove="/usr/bin/sudo /usr/share/debian-edu-config/tools/gosa-sync-dns-nfs" 
+          postmodify="/usr/bin/sudo /usr/share/debian-edu-config/tools/gosa-sync-dns-nfs"/>
      <tab class="workstartup" name="Startup"/>
      <tab class="ServerService" name="Services"/>
      <tab class="faiSummaryTab" name="Deployment summary"/>
@@ -213,7 +226,10 @@
   </servtabs>
 
   <worktabs>
-     <tab class="workgeneric" name="Generic" postcreate="/usr/bin/sudo /usr/share/debian-edu-config/tools/gosa-sync-dns-nfs" postremove="/usr/bin/sudo /usr/share/debian-edu-config/tools/gosa-sync-dns-nfs" postmodify="/usr/bin/sudo /usr/share/debian-edu-config/tools/gosa-sync-dns-nfs"/>
+     <tab class="workgeneric" name="Generic" 
+          postcreate="/usr/bin/sudo /usr/share/debian-edu-config/tools/gosa-sync-dns-nfs" 
+          postremove="/usr/bin/sudo /usr/share/debian-edu-config/tools/gosa-sync-dns-nfs" 
+          postmodify="/usr/bin/sudo /usr/share/debian-edu-config/tools/gosa-sync-dns-nfs"/>
      <tab class="workstartup" name="Startup"/>
      <tab class="workservice" name="Devices"/>
      <tab class="printgeneric" name="Printer"/>
@@ -225,18 +241,27 @@
   </worktabs>
 
   <printtabs>
-     <tab class="printgeneric" name="Generic" postcreate="/usr/bin/sudo /usr/share/debian-edu-config/tools/gosa-sync-dns-nfs" postremove="/usr/bin/sudo /usr/share/debian-edu-config/tools/gosa-sync-dns-nfs" postmodify="/usr/bin/sudo /usr/share/debian-edu-config/tools/gosa-sync-dns-nfs"/>
+     <tab class="printgeneric" name="Generic" 
+          postcreate="/usr/bin/sudo /usr/share/debian-edu-config/tools/gosa-sync-dns-nfs" 
+          postremove="/usr/bin/sudo /usr/share/debian-edu-config/tools/gosa-sync-dns-nfs" 
+          postmodify="/usr/bin/sudo /usr/share/debian-edu-config/tools/gosa-sync-dns-nfs"/>
      <!-- <tab class="glpiPrinterAccount" name="Inventory" /> -->
   </printtabs>
 
   <componenttabs>
-     <tab class="componentGeneric" name="Generic" postcreate="/usr/bin/sudo /usr/share/debian-edu-config/tools/gosa-sync-dns-nfs" postremove="/usr/bin/sudo /usr/share/debian-edu-config/tools/gosa-sync-dns-nfs" postmodify="/usr/bin/sudo /usr/share/debian-edu-config/tools/gosa-sync-dns-nfs"/>
+     <tab class="componentGeneric" name="Generic" 
+          postcreate="/usr/bin/sudo /usr/share/debian-edu-config/tools/gosa-sync-dns-nfs" 
+          postremove="/usr/bin/sudo /usr/share/debian-edu-config/tools/gosa-sync-dns-nfs" 
+          postmodify="/usr/bin/sudo /usr/share/debian-edu-config/tools/gosa-sync-dns-nfs"/>
      <tab class="netgroupSystem" name="NIS Netgroup"/>
      <!-- <tab class="glpiAccount" name="Inventory" /> -->
   </componenttabs>
 
   <wintabs>
-     <tab class="wingeneric" name="Generic" postcreate="/usr/bin/sudo /usr/share/debian-edu-config/tools/gosa-sync-dns-nfs" postremove="/usr/bin/sudo /usr/share/debian-edu-config/tools/gosa-sync-dns-nfs" postmodify="/usr/bin/sudo /usr/share/debian-edu-config/tools/gosa-sync-dns-nfs"/>
+     <tab class="wingeneric" name="Generic" 
+          postcreate="/usr/bin/sudo /usr/share/debian-edu-config/tools/gosa-sync-dns-nfs" 
+          postremove="/usr/bin/sudo /usr/share/debian-edu-config/tools/gosa-sync-dns-nfs" 
+          postmodify="/usr/bin/sudo /usr/share/debian-edu-config/tools/gosa-sync-dns-nfs"/>
      <tab class="netgroupSystem" name="NIS Netgroup"/>
      <!-- <tab class="glpiAccount" name="Inventory" /> -->
   </wintabs>
@@ -384,13 +409,63 @@
 
   -->
   <!-- If you broke your setup using the propertyEditor, then set 'ignoreLdapProperties' to true. -->
-  <main default="default" logging="true" listSummary="true" displayErrors="false" schemaCheck="true" copyPaste="true" forceGlobals="true" forceSSL="true" ldapStats="false" warnSSL="true" primaryGroupFilter="true" storeFilterSettings="true" sendCompressedOutput="true" modificationDetectionAttribute="entryCSN" language="" theme="default" sessionLifetime="7200" templateCompileDirectory="/var/spool/gosa" debugLevel="0" passwordMinLength="5" passwordMinDiffer="2" passwordHook="" sambaHashHook="perl -MCrypt::SmbHash -e "print join(q[:], ntlmgen \$ARGV[0]), $/;"">
+  <main default="default" 
+    logging="true" 
+    listSummary="true" 
+    displayErrors="false" 
+    schemaCheck="true" 
+    copyPaste="true" 
+    forceGlobals="true" 
+    forceSSL="true" 
+    ldapStats="false" 
+    warnSSL="true" 
+    primaryGroupFilter="true" 
+    storeFilterSettings="true" 
+    sendCompressedOutput="true" 
+    modificationDetectionAttribute="entryCSN" 
+    language="" 
+    theme="default" 
+    sessionLifetime="7200" 
+    templateCompileDirectory="/var/spool/gosa" 
+    debugLevel="0" 
+    passwordMinLength="5" 
+    passwordMinDiffer="2" 
+    passwordHook="" 
+    sambaHashHook="perl -MCrypt::SmbHash -e "print join(q[:], ntlmgen \$ARGV[0]), $/;"">
 
     <!-- Location definition -->
-    <location name="Debian Edu" passwordDefaultHash="ssha" accountPrimaryAttribute="uid" userRDN="ou=people" groupRDN="ou=group" netgroupRDN="ou=netgroup" gidNumberBase="1000" uidNumberBase="1000" disabled_gosaSupportURI="gosa-si-secret at server:20081" disabled_gosaSupportTimeout="15" loginAttribute="uid" timezone="Etc/UTC" honourUnitTags="false" useSaslForKerberos="false" rfc2307bis="false" personalTitleInDN="false" idGenerator="{%givenName[3-6]}{%sn[3-6]}" strictNamingRules="true" mailAttribute="mail" gosaSharedPrefix="" mailUserCreation="" mailFolderCreation="" imapTimeout="10" ldapTLS="true" honourIvbbAttributes="false" enableSnapshots="true" snapshotBase="ou=snapshots,dc=skole,dc=skolelinux,dc=no" snapshotAdminDn="cn=gosa-admin,ou=ldap-access,dc=skole,dc=skolelinux,dc=no" snapshotAdminPassword="$GOSAPWD" snapshotURI="ldaps://ldap.intern/" config="ou=gosa,ou=configs,ou=systems,dc=skole,dc=skolelinux,dc=no">
-
-              <referral URI="ldap://ldap.intern/dc=skole,dc=skolelinux,dc=no" adminDn="cn=gosa-admin,ou=ldap-access,dc=skole,dc=skolelinux,dc=no" adminPassword="$GOSAPWD"/>
-
+    <location name="Debian Edu" 
+        passwordDefaultHash="ssha" 
+        accountPrimaryAttribute="uid" 
+        userRDN="ou=people" 
+        groupRDN="ou=group" 
+        netgroupRDN="ou=netgroup" 
+        gidNumberBase="1000" 
+        uidNumberBase="1000" 
+        disabled_gosaSupportURI="gosa-si-secret at server:20081" 
+        disabled_gosaSupportTimeout="15" 
+        loginAttribute="uid" 
+        timezone="Etc/UTC" 
+        honourUnitTags="false" 
+        useSaslForKerberos="false" 
+        rfc2307bis="false" 
+        personalTitleInDN="false" 
+        idGenerator="{%givenName[1-3]}{%sn[1-3]}" 
+        strictNamingRules="true" 
+        mailAttribute="mail" 
+        gosaSharedPrefix="" 
+        mailUserCreation="" 
+        mailFolderCreation="" 
+        imapTimeout="10" 
+        ldapTLS="true" 
+        honourIvbbAttributes="false" 
+        enableSnapshots="true" 
+        snapshotBase="ou=snapshots,dc=skole,dc=skolelinux,dc=no" 
+        snapshotAdminDn="cn=gosa-admin,ou=ldap-access,dc=skole,dc=skolelinux,dc=no" snapshotAdminPassword="$GOSAPWD" 
+        snapshotURI="ldaps://ldap.intern/" 
+        config="ou=gosa,ou=configs,ou=systems,dc=skole,dc=skolelinux,dc=no">
+            <referral URI="ldap://ldap.intern/dc=skole,dc=skolelinux,dc=no" 
+                adminDn="cn=gosa-admin,ou=ldap-access,dc=skole,dc=skolelinux,dc=no" adminPassword="$GOSAPWD"/>
     </location>
   </main>
 </conf>




More information about the debian-edu-commits mailing list