From: cajus <cajus@594d385d-05f5-0310-b6e9-bd551577e9d8>
Date: Thu, 24 Jul 2008 09:08:24 +0000 (+0000)
Subject: Fixed typo in gosa.conf
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=ba14e5d1282cd74f6502ea6da8d801a89843652f;p=gosa.git

Fixed typo in gosa.conf
Updated gosa.conf manual page


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

diff --git a/gosa-core/contrib/gosa.conf b/gosa-core/contrib/gosa.conf
index dcb8abef9..9b6deac18 100644
--- a/gosa-core/contrib/gosa.conf
+++ b/gosa-core/contrib/gosa.conf
@@ -555,7 +555,7 @@
 {else}
               cyrusunixstyle="false"
 {/if}
-              mail_uattrib="{$cv.mail_attrib}"
+              mail_attrib="{$cv.mail_attrib}"
 {if $cv.mail_settings.vacationdir_active}
               vacationdir="{$cv.mail_settings.vacationdir}"
 {/if}
diff --git a/gosa-core/contrib/gosa.conf.5 b/gosa-core/contrib/gosa.conf.5
index 6e0fb2da2..5ed552c52 100644
--- a/gosa-core/contrib/gosa.conf.5
+++ b/gosa-core/contrib/gosa.conf.5
@@ -921,8 +921,60 @@ The
 .I sambaidmapping
 statement tells GOsa to maintain sambaIdmapEntry objects. Depending on your
 setup this can drastically improve the windows login performance.
+.PP
+.PP
+
+
+.B Mail options
+.PP
+.B mailMethod
+.I cyrus/kolab/golab/sendmail
+.PP
+The
+.I mailMethod
+statement tells GOsa which mail method the setup should use to communicate
+with a possible mail server. Leave this undefined if your mail method does
+not match the predefined ones.
+
+.I cyrus
+maintains accounts and sieve scripts in cyrus servers.
+.I kolab
+is like cyrus, but lets the kolab daemon maintain the accounts.
+.I golab is like cyrus - just with kolab attributes.
+.I sendmail just disables everything which is IMAP dependent.
+.PP
+
+.B cyrusunixstyle
+.I bool
+.PP
+The
+.I cyrusunixstyle
+statement determines if GOsa should use "foo/bar" or "foo.bar" namespaces
+in IMAP. Unix style is with slashes.
+
+.B mail_attrib
+.I mail/uid
+.PP
+The
+.I mail_attrib
+statement determines which attribute GOsa will use to create accounts.
+Valid values are
+.I mail
+and
+.I uid.
+  vacationdir
 
+.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.
+
+   Greetings,
+   %givenName %sn
+.fi
 
+  mailQueueScriptPath
 
 .SH AUTHOR
 .B gosa.conf(5)