Updaed conf and man page

git-svn-id: https://oss.gonicus.de/repositories/gosa/trunk@11972 594d385d-05f5-0310-b6e9-bd551577e9d8

diff --git a/gosa-core/contrib/gosa.conf b/gosa-core/contrib/gosa.conf
index 9b6deac1892c702c606a28358fec21291562b859..db4fc5e2577ad3d356d35645578917473e28cd9c 100644 (file)
--- a/gosa-core/contrib/gosa.conf
+++ b/gosa-core/contrib/gosa.conf
@@ -494,7 +494,6 @@
     <location name="{$cv.location}"
               hash="{$cv.encryption}"
               dnmode="{$cv.peopledn}"
-              server="{$cv.connection}"
               people="{$cv.peopleou}"
               groups="{$cv.groupou}"
               gidbase="{$cv.uidbase}"

diff --git a/gosa-core/contrib/gosa.conf.5 b/gosa-core/contrib/gosa.conf.5
index 5ed552c5219227487223714b6955507a6fdc4841..b491ac92b5f36b7a91fff1ccc69b8a6586c89018 100644 (file)
--- a/gosa-core/contrib/gosa.conf.5
+++ b/gosa-core/contrib/gosa.conf.5
@@ -962,10 +962,18 @@ Valid values are
 .I mail
 and
 .I uid.
-  vacationdir
+
+.B vacationdir
+.I path
+.PP
+The
+.I vacationdir
+statement sets the path where GOsa will look for vacation message
+templates. Default is /etc/gosa/vacation.
+
+Example template /etc/gosa/vacation/business.txt:
 
 .nf
-   /etc/gosa/vacation/business.txt:
    DESC:Away from desk
    Hi, I'm currently away from my desk. You can contact me on
    my cell phone via %mobile.
@@ -973,8 +981,65 @@ and
    Greetings,
    %givenName %sn
 .fi
+.pp
+
+
+.B Debug options
+.PP
+.B displayerrors
+.I bool
+.PP
+The
+.I displayerrors
+statement tells GOsa to show PHP errors in the upper part of the screen. This
+should be disabled in productive deployments, because there might be some
+important passwords arround.
+.pp
+
+.B ldapstats
+.I bool
+.PP
+The
+.I ldapstats
+statement tells GOsa to track LDAP timing statistics to the syslog. This may
+help to find indexing problems or bad search filters.
+.pp
+
+.B ignore_acl
+.I dn
+.PP
+The
+.I ignore_acl
+value tells GOsa to ignore complete ACL sets for the given DN. Add your
+DN here and you'll be able to restore accidently dropped ACLs.
+.pp
+
+.B debuglevel
+.I integer
+.PP
+The
+.I debuglevel
+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
+
+
+
+              <referral url="{$cv.connection}/{$cv.base}"
+                       admin="{$cv.admin}"
+                       password="{$cv.password}" />
+
+
 
-  mailQueueScriptPath
 
 .SH AUTHOR
 .B gosa.conf(5)