OpenPKG CVS Repository
http://cvs.openpkg.org/
____________________________________________________________________________
Server: cvs.openpkg.org Name: Torsten Homeyer
Root: /v/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src Date: 07-Sep-2006 14:33:59
Branch: HEAD Handle: 2006090713335801
Modified files:
openpkg-src/imapd cyrus.conf imapd.conf imapd.spec rc.imapd
Log:
adding replication option, first cut
Summary:
Revision Changes Path
1.4 +15 -0 openpkg-src/imapd/cyrus.conf
1.15 +9 -0 openpkg-src/imapd/imapd.conf
1.162 +9 -5 openpkg-src/imapd/imapd.spec
1.26 +1 -1 openpkg-src/imapd/rc.imapd
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/imapd/cyrus.conf
============================================================================
$ cvs diff -u -r1.3 -r1.4 cyrus.conf
--- openpkg-src/imapd/cyrus.conf 18 Mar 2005 14:51:19 -0000 1.3
+++ openpkg-src/imapd/cyrus.conf 7 Sep 2006 12:33:58 -0000 1.4
@@ -5,6 +5,8 @@
START {
# do not delete this entry!
recover cmd="@l_prefix@/bin/ctl_cyrusdb -r"
+# # for a rolling replication client only
+# syncclient cmd="/@l_prefix@/bin/sync_client -r"
# # this is only necessary if using idled for IMAP IDLE
# idled cmd="idled"
@@ -16,11 +18,24 @@
pop3 cmd="pop3d" listen="localhost:pop3" prefork=0
pop3s cmd="pop3d -s" listen="localhost:pop3s" prefork=0
+# # for a replication master only
+# syncserver cmd="sync_server" listen="localhost:csync" prefork=0
+
+# # for a replication client only
+# imap cmd="imapd" listen="localhost:imap" prefork=0
provide_uuid=33
+# imaps cmd="imapd -s" listen="localhost:imaps" prefork=0
provide_uuid=33
+# pop3 cmd="pop3d" listen="localhost:pop3" prefork=0
provide_uuid=33
+# pop3s cmd="pop3d -s" listen="localhost:pop3s" prefork=0
provide_uuid=33
+
# at least one LMTP is required for delivery
# KEEP the unix socket name IN SYNC with imapd.conf
lmtp cmd="lmtpd" listen="localhost:lmtp" prefork=0
lmtpunix cmd="lmtpd" listen="@l_prefix@/var/imapd/socket/lmtp" prefork=0
+# # for a replication client only
+# lmtp cmd="lmtpd" listen="localhost:lmtp" prefork=0
provide_uuid=33
+# lmtpunix cmd="lmtpd" listen="@l_prefix@/var/imapd/socket/lmtp" prefork=0
provide_uuid=33
+
# # useful if you need to give users remote access to sieve
# sieve cmd="timsieved" listen="localhost:sieve" prefork=0
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/imapd/imapd.conf
============================================================================
$ cvs diff -u -r1.14 -r1.15 imapd.conf
--- openpkg-src/imapd/imapd.conf 22 Feb 2006 18:43:47 -0000 1.14
+++ openpkg-src/imapd/imapd.conf 7 Sep 2006 12:33:59 -0000 1.15
@@ -26,3 +26,12 @@
defaultdomain: @l_domainname@
virtdomains: on
+# uncomment the following if you have compliled
+# with replication
+#sync_host:
+#sync_authname:
+#sync_realm:
+#sync_password:
+#sync_machineid: 33
+#sync_log: yes # for rolling replications
+#sync_repeat_interval: 60 # intervall in which replication takes place
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/imapd/imapd.spec
============================================================================
$ cvs diff -u -r1.161 -r1.162 imapd.spec
--- openpkg-src/imapd/imapd.spec 25 Aug 2006 19:16:51 -0000 1.161
+++ openpkg-src/imapd/imapd.spec 7 Sep 2006 12:33:59 -0000 1.162
@@ -33,13 +33,14 @@
Group: Mail
License: BSD
Version: 2.3.7
-Release: 20060825
+Release: 20060907
# package options
-%option with_fsl yes
-%option with_group no
-%option with_atvdom no
-%option with_drac no
+%option with_fsl yes
+%option with_group no
+%option with_atvdom no
+%option with_drac no
+%option with_replication no
# list of sources
Source0:
ftp://ftp.andrew.cmu.edu/pub/cyrus-mail/cyrus-imapd-%{version}.tar.gz
@@ -203,6 +204,9 @@
--with-cyrus-user=%{l_rusr} \
--with-cyrus-group=%{l_rgrp} \
--with-pidfile=%{l_prefix}/var/imapd/cyrus-master.pid \
+%if "%{with_replication}" == "yes"
+ --enable-replication \
+%endif
--without-krb
# redirect the hard coded file paths
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/imapd/rc.imapd
============================================================================
$ cvs diff -u -r1.25 -r1.26 rc.imapd
--- openpkg-src/imapd/rc.imapd 25 Aug 2006 19:16:51 -0000 1.25
+++ openpkg-src/imapd/rc.imapd 7 Sep 2006 12:33:59 -0000 1.26
@@ -1,4 +1,4 @@
[EMAIL PROTECTED]@/bin/openpkg rc
[EMAIL PROTECTED]@/lib/openpkg/bash @l_prefix@/etc/rc
##
## rc.imapd -- Run-Commands
##
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List openpkg-cvs@openpkg.org
