Fix typo in local_zarafa.m4.

Add more documentation to README.OpenBSD.
This commit is contained in:
ajacoutot 2010-06-03 14:01:57 +00:00
parent 1ad73fb5ea
commit 71b4a9f7a4
3 changed files with 24 additions and 8 deletions

View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.36 2010/05/21 13:34:43 ajacoutot Exp $
# $OpenBSD: Makefile,v 1.37 2010/06/03 14:01:57 ajacoutot Exp $
COMMENT-main= MS Exchange groupware suite replacement
COMMENT-php= MAPI extensions for php5
@ -6,7 +6,7 @@ COMMENT-php= MAPI extensions for php5
V= 6.30.14
DISTNAME= zarafa-${V}
PKGNAME-main= ${DISTNAME}p0
PKGNAME-main= ${DISTNAME}p1
PKGNAME-php= php5-mapi-${V}
CATEGORIES= mail www productivity

View File

@ -1,4 +1,4 @@
$OpenBSD: README.OpenBSD,v 1.10 2009/11/21 12:09:29 ajacoutot Exp $
$OpenBSD: README.OpenBSD,v 1.11 2010/06/03 14:01:57 ajacoutot Exp $
*** Upgrading users: refer to zarafa documentation on the web to check
*** if any particular step is required after upgrading to a new version.
@ -87,10 +87,12 @@ Mail delivery agent configuration
---------------------------------
The easiest way to use zarafa-dagent system-wide under a stock OpenBSD
sendmail installation is to use procmail(1).
sendmail(8) installation is to use procmail(1).
See the following URL for other MTA integration:
http://www.zarafa.com/?q=en/faq/61
Anyway, here are the 3 ways of integrating Zarafa with sendmail(8).
1. Using procmail.
==================
First, install the procmail package and configure ${SYSCONFDIR}/procmailrc
@ -106,12 +108,26 @@ restart sendmail(8):
2. Configuring sendmail to use the zarafa-dagent directly.
==========================================================
To enable the Zarafa dagent for all other deliveries (including
localhost), add the following lines to your sendmail.mc and restart
sendmail(8):
To enable the Zarafa dagent delivery from localhost, add the following
lines to your sendmail.mc and restart sendmail(8):
FEATURE(`local_zarafa')dnl
To enable the Zarafa dagent for all other deliveries, add the following:
MAILER(`zarafa')dnl
3. Using a .forward file.
=========================
Add the following .forward file under the user(s) home directory that
will use Zarafa:
"|${TRUEPREFIX}/bin/zarafa-dagent <username>"
You can automate this step by copying
${TRUEPREFIX}/share/examples/zarafa/createuser.dotforward
to
${SYSCONFDIR}/zarafa/userscripts/createuser.d/
The .forward will be automatically generated when a new user is added to
Zarafa.
The PHP mapi module and OpenBSD Apache
--------------------------------------

View File

@ -14,7 +14,7 @@ define(`LOCAL_MAILER_PATH',
ifdef(`ZARAFA_MAILER_PATH',
ZARAFA_MAILER_PATH,
`${TRUEPREFIX}/bin/zarafa-dagent'),
ARG_))
_ARG_))
define(`LOCAL_MAILER_ARGS',
ifelse(len(X`'_ARG2_), `1', `zarafa-dagent $u', _ARG2_))
undefine(`_LOCAL_PROCMAIL_')