[pkg-kolab] r57 - trunk/kolab-cyrus-imapd/debian
Steffen Joeris
white-guest at costa.debian.org
Sat Dec 31 11:07:19 UTC 2005
Author: white-guest
Date: 2005-12-31 11:07:18 +0000 (Sat, 31 Dec 2005)
New Revision: 57
Modified:
trunk/kolab-cyrus-imapd/debian/changelog
trunk/kolab-cyrus-imapd/debian/cyrus.conf
trunk/kolab-cyrus-imapd/debian/imapd.conf
trunk/kolab-cyrus-imapd/debian/kolab-cyrus-admin.files
trunk/kolab-cyrus-imapd/debian/kolab-cyrus-common.cron.daily
trunk/kolab-cyrus-imapd/debian/kolab-cyrus-common.files
trunk/kolab-cyrus-imapd/debian/kolab-cyrus-common.manpages
trunk/kolab-cyrus-imapd/debian/rules
Log:
* drop nntp and snmp, we don't need it for kolab
* correct conf file
* correct some *.files pathes
* use of manpage
* add comments to changelog
* wish you all a good start into year 2006
Modified: trunk/kolab-cyrus-imapd/debian/changelog
===================================================================
--- trunk/kolab-cyrus-imapd/debian/changelog 2005-12-23 23:11:40 UTC (rev 56)
+++ trunk/kolab-cyrus-imapd/debian/changelog 2005-12-31 11:07:18 UTC (rev 57)
@@ -4,5 +4,20 @@
part of the Kolab Groupware. See ITP #180634 or Kolab on alioth
https://alioth.debian.org/projects/pkg-kolab/
+ [ Changes for Kolab ]
+ * renamed to kolab-cyrus-imapd
+ * used orig.tar from kolab upstream (open package)
+ * provide different cyrus.conf
+ * changed some parts of debian/rules for different packaging
+ * dropped nntp and snmp
+ * fixed lib/Makefile with patch
+ * applied additional kolab patches (provided by kolab upstream)
+ * new build-depends against cdbs for simple-patchsys
+ * conflicts with official cyrus
+ * drop upgrade information for cyrus
+ * uncomment lintian and linda overrides for now
+ * change path for binary cyradm in debian/rules
+ * modify pathes and stuff for init script
+
-- Steffen Joeris <steffen.joeris at skolelinux.de> Mon, 12 Dec 2005 09:23:02 +0000
Modified: trunk/kolab-cyrus-imapd/debian/cyrus.conf
===================================================================
--- trunk/kolab-cyrus-imapd/debian/cyrus.conf 2005-12-23 23:11:40 UTC (rev 56)
+++ trunk/kolab-cyrus-imapd/debian/cyrus.conf 2005-12-31 11:07:18 UTC (rev 57)
@@ -1,44 +1,82 @@
-##
-## @l_prefix@/etc/cyrus-imapd/cyrus.conf - Cyrus IMAP server configuration
-##
+# Debian defaults for Cyrus IMAP server/cluster implementation
+# see cyrus.conf(5) for more information
+#
+# All the tcp services are tcpd-wrapped. see hosts_access(5)
+# $Id: cyrus.conf 120 2005-05-01 03:23:18Z sven $
START {
- # do not delete this entry!
- recover cmd="@l_prefix@/bin/ctl_cyrusdb -r"
+ # do not delete this entry!
+ recover cmd="/usr/sbin/ctl_cyrusdb -r"
+
+ # this is only necessary if using idled for IMAP IDLE
+ # this is NOT to be enabled right now in Debian builds
+ #idled cmd="idled"
-# # this is only necessary if using idled for IMAP IDLE
-# idled cmd="idled"
+ # this is useful on backend nodes of a Murder cluster
+ # it causes the backend to syncronize its mailbox list with
+ # the mupdate master upon startup
+ #mupdatepush cmd="/usr/sbin/ctl_mboxlist -m"
+
+ # this is recommended if using duplicate delivery suppression
+ delprune cmd="/usr/sbin/ctl_deliver -E 3"
+ # this is recommended if caching TLS sessions
+ tlsprune cmd="/usr/sbin/tls_prune"
}
+# UNIX sockets start with a slash and are absolute paths
+# you can use a maxchild=# to limit the maximum number of forks of a service
+# you can use babysit=true and maxforkrate=# to keep tight tabs on the service
+# most services also accept -U (limit number of reuses) and -T (timeout)
SERVICES {
- imap cmd="imapd" listen="localhost:imap" prefork=0
- imaps cmd="imapd -s" listen="localhost:imaps" prefork=0
- pop3 cmd="pop3d" listen="localhost:pop3" prefork=0
- pop3s cmd="pop3d -s" listen="localhost:pop3s" prefork=0
+ # --- Normal cyrus spool, or Murder backends ---
+ # add or remove based on preferences
+ imap cmd="imapd -U 30" listen="imap" prefork=0 maxchild=100
+ #imaps cmd="imapd -s -U 30" listen="imaps" prefork=0 maxchild=100
+ pop3 cmd="pop3d -U 30" listen="pop3" prefork=0 maxchild=50
+ #pop3s cmd="pop3d -s -U 30" listen="pop3s" prefork=0 maxchild=50
+ #nntp cmd="nntpd -U 30" listen="nntp" prefork=0 maxchild=100
+ #nntps cmd="nntpd -s -U 30" listen="nntps" prefork=0 maxchild=100
- # 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
+ # At least one form of LMTP is required for delivery
+ # (you must keep the Unix socket name in sync with imap.conf)
+ #lmtp cmd="lmtpd" listen="localhost:lmtp" prefork=0 maxchild=20
+ lmtpunix cmd="lmtpd" listen="/var/run/cyrus/socket/lmtp" prefork=0 maxchild=20
+ # ----------------------------------------------
-# # useful if you need to give users remote access to sieve
-# sieve cmd="timsieved" listen="localhost:sieve" prefork=0
+ # useful if you need to give users remote access to sieve
+ # by default, we limit this to localhost in Debian
+ sieve cmd="timsieved" listen="localhost:sieve" prefork=0 maxchild=100
-# # this one is needed for the notification services
-# notify cmd="notifyd" listen="@l_prefix@/var/imapd/socket/notify" prefork=1 proto="udp"
+ # this one is needed for the notification services
+ notify cmd="notifyd" listen="/var/run/cyrus/socket/notify" proto="udp" prefork=1
+
+ # --- Murder frontends -------------------------
+ # enable these and disable the matching services above,
+ # except for sieve (which deals automatically with Murder)
+
+ # mupdate database service - must prefork at least 1
+ # (mupdate slaves)
+ #mupdate cmd="mupdate" listen=3905 prefork=1
+ # (mupdate master, only one in the entire cluster)
+ #mupdate cmd="mupdate -m" listen=3905 prefork=1
+
+ # proxies that will connect to the backends
+ #imap cmd="proxyd" listen="imap" prefork=0 maxchild=100
+ #imaps cmd="proxyd -s" listen="imaps" prefork=0 maxchild=100
+ #pop3 cmd="pop3proxyd" listen="pop3" prefork=0 maxchild=50
+ #pop3s cmd="pop3proxyd -s" listen="pop3s" prefork=0 maxchild=50
+ #lmtp cmd="lmtpproxyd" listen="lmtp" prefork=1 maxchild=20
+ # ----------------------------------------------
}
EVENTS {
- # this is required
- checkpoint cmd="@l_prefix@/bin/ctl_cyrusdb -c" period=30
+ # this is required
+ checkpoint cmd="/usr/sbin/ctl_cyrusdb -c" period=30
- # this is only necessary if using duplicate delivery suppression
- delprune cmd="@l_prefix@/bin/ctl_deliver -E 3" period=1440
+ # this is only necessary if using duplicate delivery suppression
+ delprune cmd="/usr/sbin/ctl_deliver -E 3" at=0401
- # this is only necessary if caching TLS sessions
- tlsprune cmd="@l_prefix@/bin/tls_prune" period=1440
-
- # this is only necessary if using squatter, a mailbox indexer
- squatter cmd="@l_prefix@/bin/squatter -r -s user" period=1440
+ # this is only necessary if caching TLS sessions
+ tlsprune cmd="/usr/sbin/tls_prune" at=0401
}
Modified: trunk/kolab-cyrus-imapd/debian/imapd.conf
===================================================================
--- trunk/kolab-cyrus-imapd/debian/imapd.conf 2005-12-23 23:11:40 UTC (rev 56)
+++ trunk/kolab-cyrus-imapd/debian/imapd.conf 2005-12-31 11:07:18 UTC (rev 57)
@@ -4,25 +4,25 @@
##
# Warning: Do not use a trailing slash in paths!
-configdirectory: @l_prefix@/var/imapd
-partition-default: @l_prefix@/var/imapd/spool
-admins: @l_rusr@
-defaultacl: @l_rusr@ lrswipcda
+configdirectory: /var/lib/cyrus
+partition-default: /var/spool/cyrus/mail
+#admins: @l_rusr@
+#defaultacl: @l_rusr@ lrswipcda
sasl_pwcheck_method: saslauthd
sasl_mech_list: PLAIN
-sendmail: @l_prefix@/sbin/sendmail
-lmtpsocket: @l_prefix@/var/imapd/socket/lmtp
-temp_path: @l_prefix@/var/imapd/tmp
+#sendmail: /sbin/sendmail
+lmtpsocket: /var/run/cyrus/socket/lmtp
+temp_path: /var/tmp
unixhierarchysep: yes
#altnamespace: yes
allowanonymouslogin: no
allowplaintext: yes
allowusermoves: no
-servername: @l_hostname at .@l_domainname@
+#servername: @l_hostname at .@l_domainname@
autocreatequota: 10000
reject8bit: no
quotawarn: 90
timeout: 30
-defaultdomain: @l_domainname@
-virtdomains: on
+#defaultdomain:
+#virtdomains: on
Modified: trunk/kolab-cyrus-imapd/debian/kolab-cyrus-admin.files
===================================================================
--- trunk/kolab-cyrus-imapd/debian/kolab-cyrus-admin.files 2005-12-23 23:11:40 UTC (rev 56)
+++ trunk/kolab-cyrus-imapd/debian/kolab-cyrus-admin.files 2005-12-31 11:07:18 UTC (rev 57)
@@ -1,3 +1,4 @@
usr/bin/cyradm
usr/bin/sieveshell
+usr/bin/installsieve
usr/share/icons/*
Modified: trunk/kolab-cyrus-imapd/debian/kolab-cyrus-common.cron.daily
===================================================================
--- trunk/kolab-cyrus-imapd/debian/kolab-cyrus-common.cron.daily 2005-12-23 23:11:40 UTC (rev 56)
+++ trunk/kolab-cyrus-imapd/debian/kolab-cyrus-common.cron.daily 2005-12-31 11:07:18 UTC (rev 57)
@@ -25,7 +25,7 @@
bakfile=${bak}/cyrus-mboxlist.txt.gz
CONF=/etc/imapd.conf
CHKCYRUS=0
-[ -r /etc/default/cyrus21 ] && . /etc/default/cyrus21
+[ -r /etc/default/kolab-cyrus ] && . /etc/default/kolab-cyrus
umask 022
# 1. backup mailbox database
Modified: trunk/kolab-cyrus-imapd/debian/kolab-cyrus-common.files
===================================================================
--- trunk/kolab-cyrus-imapd/debian/kolab-cyrus-common.files 2005-12-23 23:11:40 UTC (rev 56)
+++ trunk/kolab-cyrus-imapd/debian/kolab-cyrus-common.files 2005-12-31 11:07:18 UTC (rev 57)
@@ -9,9 +9,12 @@
usr/sbin/tls_prune
usr/sbin/mbpath
usr/sbin/arbitron*
+usr/lib/cyrus/bin/cyr_expire
usr/lib/cyrus/bin/lmtpd
usr/lib/cyrus/bin/timsieved
+usr/lib/cyrus/bin/sievec
+usr/lib/cyrus/bin/mbexamine
+usr/lib/cyrus/bin/smmapd
usr/lib/cyrus/bin/notifyd
usr/lib/cyrus/bin/fud
usr/lib/cyrus/get-backtrace.gdb
-usr/share/snmp
Modified: trunk/kolab-cyrus-imapd/debian/kolab-cyrus-common.manpages
===================================================================
--- trunk/kolab-cyrus-imapd/debian/kolab-cyrus-common.manpages 2005-12-23 23:11:40 UTC (rev 56)
+++ trunk/kolab-cyrus-imapd/debian/kolab-cyrus-common.manpages 2005-12-31 11:07:18 UTC (rev 57)
@@ -1,6 +1,7 @@
debian/tmp/usr/share/man/man5/cyrus.conf.5
debian/tmp/usr/share/man/man5/imapd.conf.5
debian/cyrdump.8
+debian/cyrus-makedirs.8
debian/tmp/usr/share/man/man8/mbpath.8
debian/tmp/usr/share/man/man8/arbitron.8
debian/tmp/usr/share/man/man8/arbitronsort.8
Modified: trunk/kolab-cyrus-imapd/debian/rules
===================================================================
--- trunk/kolab-cyrus-imapd/debian/rules 2005-12-23 23:11:40 UTC (rev 56)
+++ trunk/kolab-cyrus-imapd/debian/rules 2005-12-31 11:07:18 UTC (rev 57)
@@ -201,6 +201,9 @@
mkdir -p $(TMPPKG)/usr/share/perl5
#mv $(TMPPKG)/lib/perl5/Cyrus $(TMPPKG)/usr/share/perl5/Cyrus
#mv $(TMPPKG)/lib/* $(TMPPKG)/usr/lib
+
+ # modification for kolab, move perl stuff
+ mv $(TMPPKG)/usr/share/lib/perl5 $(TMPPKG)/usr/lib/perl5
# for stuff in /etc, small modification (really install the file under /etc)
mkdir -p $(TMPPKG)/etc/cyrus $(TMPPKG)/etc/pam.d
@@ -222,9 +225,10 @@
install -m 644 debian/cyrdump.8 $(TMPPKG)/usr/share/man/man8/cyrdump.8
install -m 644 debian/arbitronsort.8 $(TMPPKG)/usr/share/man/man8/arbitronsort.8
+ # Uncomment the following because kolab uses procmail
# SNMP files
- mkdir -p $(TMPPKG)/usr/share/snmp/mibs
- install -m 644 master/CYRUS-MASTER.mib $(TMPPKG)/usr/share/snmp/mibs/CYRUS-MASTER-MIB.txt
+ #mkdir -p $(TMPPKG)/usr/share/snmp/mibs
+ #install -m 644 master/CYRUS-MASTER.mib $(TMPPKG)/usr/share/snmp/mibs/CYRUS-MASTER-MIB.txt
# Install cyradm icons
mkdir -p $(TMPPKG)/usr/share/icons/mini
More information about the pkg-kolab-devel
mailing list