Update ogroup managemnent

[gosa.git] / gosa-core / contrib / gosa.conf.5

diff --git a/gosa-core/contrib/gosa.conf.5 b/gosa-core/contrib/gosa.conf.5
index ba1b232154305106564f2eaf4ca87b14ada8f016..e5b7d09b7ee582a605371ea37613dfee8ba596d2 100644 (file)
--- a/gosa-core/contrib/gosa.conf.5
+++ b/gosa-core/contrib/gosa.conf.5
@@ -644,6 +644,25 @@ selecting
 .I personalTitleInDN.
 .PP
 
+.B accountRDN
+.I pattern
+.PP
+The
+.I accountRDN
+option tells GOsa to use a placeholder pattern for generating account
+RDNs. A pattern can include attribute names prefaced by a % and normal
+text:
+.nf
+accountRDN="cn=%sn %givenName"
+.fi
+This will generate a RDN consisting of cn=.... filled with surname and
+given name of the edited account. This option disables the use of
+.I accountPrimaryAttribute
+and
+.I personalTitleInDn
+in your config. The latter attributes are maintained for compatibility.
+
+
 .B personalTitleInDN
 .I bool
 .PP
@@ -904,13 +923,50 @@ can even be dynamic. Take a look at the
 definition below.
 .PP
 
+.B idAllocationMethod
+.I traditional/pool
+.PP
+The
+.I idAllocationMethod
+statement defines how GOsa generates numeric user and group id values. If it is set to
+.I traditional
+GOsa will do create a lock and perform a search for the next free ID. The lock will be
+removed after the procedure completes.
+.I pool
+will use the sambaUnixIdPool objectclass settings inside your LDAP. This one is unsafe,
+because it does not check for concurrent LDAP access and already used IDs in this range. 
+On the other hand it is much faster.
+.PP
+
 .B minId
 .I integer
 .PP
 The
 .I minId
 statement defines the minimum assignable user or group id to avoid security leaks with
-uid 0 accounts.
+uid 0 accounts. This is used for the
+.I traditional
+method
+.PP
+
+.B uidNumberPoolMin/gidNumberPoolMin
+.I integer
+.PP
+The
+.I uidNumberPoolMin/gidNumberPoolMin
+statement defines the minimum assignable user/group id for use with the
+.I pool
+method.
+.PP
+
+.B uidNumberPoolMax/gidNumberPoolMax
+.I integer
+.PP
+The
+.I uidNumberPoolMin/gidNumberPoolMin
+statement defines the highest assignable user/group id for use with the
+.I pool
+method.
 .PP
 
 .B nextIdHook
@@ -969,6 +1025,13 @@ functions supported - which can be combined:
     will generate a three digits id with the next free entry appended to
     "acct".
 
+.nf
+      idGenerator="acct{id!1}"
+.fi
+
+    will generate a one digit id with the next free entry appended to
+    "acct" - if needed.
+
 .nf
       idGenerator="ext{id#3}"
 .fi
@@ -999,15 +1062,6 @@ statement defines the base id to add to ordinary sid calculations - if not avail
 inside of the LDAP.
 .PP
 
-.B sambaversion
-.I 2/3
-.PP
-The
-.I sambaversion
-statement defines the version of samba you want to write LDAP entries for. Be sure
-to include the correct schema in this case. Valid values are 2 and 3.
-.PP
-
 .B sambaHashHook
 .I path
 .PP
@@ -1054,7 +1108,7 @@ This script can be used to do automatted dialing from the addressbook.
 .B Mail options
 .PP
 .B mailMethod
-.I Cyrus/SendmailCyrus/GOlab/Kolab/Kolab22
+.I Cyrus/SendmailCyrus/Kolab/Kolab22
 .PP
 The
 .I mailMethod
@@ -1066,7 +1120,6 @@ not match the predefined ones.
 maintains accounts and sieve scripts in cyrus servers.
 .I Kolab/Kolab22
 is like cyrus, but lets the kolab daemon maintain the accounts.
-.I GOlab is like cyrus - just with kolab attributes.
 .I SendmailCyrus is based on sendmail LDAP attributes.
 .PP
 
@@ -1105,6 +1158,13 @@ Valid values are
 and
 .I uid.
 
+.B imapTimeout
+.I Integer (default 10) 
+.PP
+The
+.I imapTimeout
+statement sets the connection timeout for imap actions.
+
 .B mailFolderCreation
 Every mail method has its own way to create mail accounts like 
 .I share/development