X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=gosa-core%2Fcontrib%2Fgosa.conf.5;h=f6efbc96f2bd0c374e4bfc2258fe787d7cd75986;hb=5bea5c96bcbaedd8444bb4e96ad636fb3b2ab0cc;hp=b491ac92b5f36b7a91fff1ccc69b8a6586c89018;hpb=cc7ebf20e5e68328381b6f9815be176798adffbf;p=gosa.git

diff --git a/gosa-core/contrib/gosa.conf.5 b/gosa-core/contrib/gosa.conf.5
index b491ac92b..f6efbc96f 100644
--- a/gosa-core/contrib/gosa.conf.5
+++ b/gosa-core/contrib/gosa.conf.5
@@ -403,6 +403,29 @@ The
 .I ppd_path
 variable defines where to store PPD files for the GOto environment plugins.
 .PP
+
+.B htaccess_auth
+.I bool
+.PP
+The
+.I htaccess_auth
+variable tells GOsa to use either htaccess authentication or LDAP authentication. This
+can be used if you want to use i.e. kerberos to authenticate the users.
+.PP
+
+.B gosa_si
+.I bool
+.PP
+The
+.I gosa_si
+defines the major gosa-si server host and the password for GOsa to connect to it.
+can be used if you want to use i.e. kerberos to authenticate the users.
+
+The format is:
+
+.nf
+credentials@host:port
+.fi
 .PP
 
 
@@ -418,6 +441,15 @@ GOsa generated lists, displaying a short summary of type and number of
 elements in the list.
 .PP
 
+.B iconsize
+.I size value
+.PP
+The
+.I iconsize
+statement sets the icon size in the main menu. Its value should be something
+like 48x48.
+.PP
+
 .B compressed
 .I true/false
 .PP
@@ -837,6 +869,7 @@ statement describes an automatic way to generate new user ids. There are two bas
 functions supported - which can be combined:
 
  a) using attributes
+
     You can specify LDAP attributes (currently only sn and givenName) in
     braces {} and add a percent sign befor it. Optionally you can strip it
     down to a number of characters, specified in []. I.e.
@@ -851,6 +884,7 @@ functions supported - which can be combined:
     input box is shown.
 
  b) using automatic id's
+
     I.e. specifying
 
 .nf
@@ -1023,23 +1057,47 @@ value tells GOsa to display certain information on each page load. Value
 is an AND combination of the following byte values:
 
 DEBUG_TRACE   = 1
+
 DEBUG_LDAP    = 2
+
 DEBUG_MYSQL   = 4
+
 DEBUG_SHELL   = 8
+
 DEBUG_POST    = 16
+
 DEBUG_SESSION = 32
+
 DEBUG_CONFIG  = 64
+
 DEBUG_ACL     = 128
 .pp
 
 
+.SH LDAP resource definition
 
-              <referral url="{$cv.connection}/{$cv.base}"
-                       admin="{$cv.admin}"
-                       password="{$cv.password}" />
+For every location you define inside your gosa.conf, you need at least
+one entry of the type
+.I referral.
+These entries define the way how to connect to some directory service.
 
+.B Example:
 
+.nf
+  <referral url="ldap://ldap.example.net/dc=example,dc=net"
+            admin="cn=gosa-admin,dc=example,dc=net"
+            password="secret" />
+.fi
 
+.I url
+is a valid LDAP url extendet by the base this referral is responsible for.
+.I admin
+is the DN which has the permission to write LDAP entries. And
+.I password
+is the corresponding password for this DN.
+
+You can define a set of referrals if you have several server to
+connect to.
 
 .SH AUTHOR
 .B gosa.conf(5)