Adding configfiles and ready to use changes.

6 files changed, 218 insertions, 3 deletions

diff --git a/packages/cyrus-imapd/cyrus-imapd_2.2.12.bb b/packages/cyrus-imapd/cyrus-imapd_2.2.12.bb
index 09d267a9c8..66c1c19079 100644
--- a/packages/cyrus-imapd/cyrus-imapd_2.2.12.bb
+++ b/packages/cyrus-imapd/cyrus-imapd_2.2.12.bb
@@ -1,12 +1,17 @@
 SECTION = "console/network"
-DEPENDS = "cyrus-sasl db"
+DEPENDS = "cyrus-sasl db3"
 LICENSE = "BSD"
-PR = "r2"
+PR = "r3"
 DEPENDS += "install-native"
 
 SRC_URI = "ftp://ftp.andrew.cmu.edu/pub/cyrus-mail/cyrus-imapd-${PV}.tar.gz \
            file://autotools.patch;patch=1 \
-           file://tail.patch;patch=1"
+           file://tail.patch;patch=1 \
+	   file://cyrus \
+	   file://cyrus.conf_2.2 \
+	   file://imapd.conf_2.2 \
+	   file://volatiles \
+	   "
 
 inherit autotools
 
@@ -23,3 +28,20 @@ TARGET_CPPFLAGS =+ "-I${STAGING_DIR}/${TARGET_SYS}/include/db4"
 # All, lib/foo.c includes <config.h> from the top level directory and
 # is natively compiled
 BUILD_CPPFLAGS += " -I${S} -I${S}/et"
+
+do_install_append () {
+	install -m 755 ${WORKDIR}/cyrus ${D}${sysconfdir}/init.d/cyrus
+	install -m 644 ${WORKDIR}/cyrus.conf_2.2 ${D}${sysconfdir}/cyrus.conf
+	install -m 644 ${WORKDIR}/imapd.conf_2.2 ${D}${sysconfdir}/imapd.conf
+	install -m 644 ${WORKDIR}/volatiles ${D}${sysconfdir}/default/volatiles/01_cyrus-imapd
+}
+
+pkg_postinst () {
+	/etc/init.d/populate-volatile.sh
+	update-rc.d cyrus start 56 3 4 5 . stop 15 0 1 6 .
+	/etc/init.d/cyrus start
+}
+
+pkg_postrm () {
+}
+
diff --git a/packages/cyrus-imapd/files/.mtn2git_empty b/packages/cyrus-imapd/files/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/cyrus-imapd/files/.mtn2git_empty
diff --git a/packages/cyrus-imapd/files/cyrus b/packages/cyrus-imapd/files/cyrus
new file mode 100644
index 0000000000..03ba55aa9c
--- /dev/null
+++ b/packages/cyrus-imapd/files/cyrus
@@ -0,0 +1,38 @@
+#! /bin/sh
+
+PATH=/sbin:/bin:/usr/sbin:/usr/bin:/usr/cyrus/bin
+DAEMON=/usr/cyrus/bin/master
+NAME=master
+DESC="Cyrus IMAP Master Daemon"
+
+case "$1" in
+  start)
+        echo -n "Starting $DESC: $NAME"
+        start-stop-daemon --start --quiet --background --pidfile /var/run/$NAME.pid  --exec $DAEMON
+        echo "."
+        ;;
+  stop)
+        echo -n "Stopping $DESC: $NAME "
+        start-stop-daemon --stop --quiet --pidfile /var/run/$NAME.pid --exec $DAEMON
+        sleep 1
+        killall imapd pop3d timsieved master lmtpd notifyd 2>/dev/null
+        echo "."
+        ;;
+  reload|force-reload)
+        echo "Reloading $DESC configuration..."
+        start-stop-daemon --stop --signal 1 --quiet --pidfile /var/run/$NAME.pid --exec $DAEMON
+        echo "done."
+        ;;
+  restart)
+        $0 stop
+        sleep 1
+        $0 start
+        ;;
+  *)
+        N=/etc/init.d/$NAME
+        echo "Usage: $N {start|stop|reload|restart|force-reload}" >&2
+        exit 1
+        ;;
+esac
+exit 0
+
diff --git a/packages/cyrus-imapd/files/cyrus.conf_2.2 b/packages/cyrus-imapd/files/cyrus.conf_2.2
new file mode 100644
index 0000000000..13e635a1ba
--- /dev/null
+++ b/packages/cyrus-imapd/files/cyrus.conf_2.2
@@ -0,0 +1,42 @@
+# Standard standalone server configuration.
+
+START {
+  # Do not delete this entry!
+  recover       cmd="ctl_cyrusdb -r"
+
+  # This is only necessary if using idled for IMAP IDLE.
+  #idled                cmd="idled"
+}
+
+# UNIX sockets start with a slash and are put into /var/imap/socket.
+SERVICES {
+  # Add or remove based on preferences.
+  imap          cmd="imapd" listen="imap2" prefork=0
+  #pop3          cmd="pop3d" listen="pop-3" prefork=0
+
+  # Don't forget to generate the needed keys for SSL or TLS
+  # (see doc/html/install-configure.html).
+  #imaps                cmd="imapd -s" listen="imaps" prefork=0
+  #pop3s                cmd="pop3d -s" listen="pop3s" prefork=0
+
+  #sieve         cmd="timsieved" listen="sieve" prefork=0
+
+  # at least one LMTP is required for delivery
+  #lmtp         cmd="lmtpd" listen="lmtp" prefork=0
+  lmtpunix      cmd="lmtpd" listen="/cyrus/tmp/socket/lmtp" prefork=0
+
+  # this is only necessary if using notifications
+  #notify       cmd="notifyd" listen="/var/imap/socket/notify" proto="udp" prefork=1
+}
+
+EVENTS {
+  # This is required.
+  checkpoint    cmd="ctl_cyrusdb -c" period=30
+
+  # This is only necessary if using duplicate delivery suppression.
+  delprune      cmd="ctl_deliver -E 3" period=1440
+
+  # This is only necessary if caching TLS sessions.
+  #tlsprune      cmd="tls_prune" period=1440
+}
+
diff --git a/packages/cyrus-imapd/files/imapd.conf_2.2 b/packages/cyrus-imapd/files/imapd.conf_2.2
new file mode 100644
index 0000000000..5cf4ca9135
--- /dev/null
+++ b/packages/cyrus-imapd/files/imapd.conf_2.2
@@ -0,0 +1,50 @@
+# Don't forget to use chattr +S (if you are using ext[23])
+# when you change these directories (read the docs).
+
+# Configuration directory
+configdirectory:        /var/lib/cyrus
+
+# Which partition to use for default mailboxes
+defaultpartition: default
+partition-default:      /var/spool/cyrus/mail
+
+sievedir:               /var/lib/cyrus/sieve
+
+## News setup
+#partition-news:	/var/spool/cyrus/news
+#newsspool:		/var/spool/news
+
+
+tls_ca_path:            /etc/ssl/certs
+tls_cert_file:          /etc/ssl/cyrus/server.crt
+tls_key_file:           /etc/ssl/cyrus/server.key
+
+# Who has the right to create Mailboxes
+admins:                 cyrus root
+
+hashimapspool:          yes
+allowanonymouslogin:    no
+allowplaintext:         yes
+
+# Minimum time between POP mail fetches in minutes
+popminpoll: 1
+
+# umask used by Cyrus programs
+umask: 077
+
+# Allow renaming of top-level mailboxes.
+#allowusermoves:         yes
+
+# Use this if sieve-scripts could be in ~user/.sieve.
+#sieveusehomedir:       yes
+
+#sasl_pwcheck_method:   saslauthd
+
+## all possible values.
+#sasl_mech_list: LOGIN PLAIN CRAM-MD5 DIGEST-MD5 NTLM
+## or limit to CRAM-MD5 only
+#sasl_mech_list: CRAM-MD5
+
+# This program will be used to send out Mails
+sendmail: /usr/sbin/sendmail
+
diff --git a/packages/cyrus-imapd/files/volatiles b/packages/cyrus-imapd/files/volatiles
new file mode 100644
index 0000000000..f707ff5519
--- /dev/null
+++ b/packages/cyrus-imapd/files/volatiles
@@ -0,0 +1,63 @@
+d cyrus mail 0750 /var/lib/cyrus
+d cyrus root 0755 /var/lib/cyrus/db
+d cyrus mail 0755 /var/lib/cyrus/proc
+d cyrus mail 0755 /var/lib/cyrus/sieve
+# if only i could: d cyrus mail 0755 /var/lib/cyrus/sieve/{a,b,c,d,e,f,g,h,i,j,k,l,m,n,o,p,q,r,s,t,u,v,w,x,y,z}
+d cyrus mail 0755 /var/lib/cyrus/sieve/a
+d cyrus mail 0755 /var/lib/cyrus/sieve/b
+d cyrus mail 0755 /var/lib/cyrus/sieve/c
+d cyrus mail 0755 /var/lib/cyrus/sieve/d
+d cyrus mail 0755 /var/lib/cyrus/sieve/e
+d cyrus mail 0755 /var/lib/cyrus/sieve/f
+d cyrus mail 0755 /var/lib/cyrus/sieve/g
+d cyrus mail 0755 /var/lib/cyrus/sieve/h
+d cyrus mail 0755 /var/lib/cyrus/sieve/i
+d cyrus mail 0755 /var/lib/cyrus/sieve/j
+d cyrus mail 0755 /var/lib/cyrus/sieve/k
+d cyrus mail 0755 /var/lib/cyrus/sieve/l
+d cyrus mail 0755 /var/lib/cyrus/sieve/m
+d cyrus mail 0755 /var/lib/cyrus/sieve/n
+d cyrus mail 0755 /var/lib/cyrus/sieve/o
+d cyrus mail 0755 /var/lib/cyrus/sieve/p
+d cyrus mail 0755 /var/lib/cyrus/sieve/q
+d cyrus mail 0755 /var/lib/cyrus/sieve/r
+d cyrus mail 0755 /var/lib/cyrus/sieve/s
+d cyrus mail 0755 /var/lib/cyrus/sieve/t
+d cyrus mail 0755 /var/lib/cyrus/sieve/u
+d cyrus mail 0755 /var/lib/cyrus/sieve/v
+d cyrus mail 0755 /var/lib/cyrus/sieve/w
+d cyrus mail 0755 /var/lib/cyrus/sieve/x
+d cyrus mail 0755 /var/lib/cyrus/sieve/y
+d cyrus mail 0755 /var/lib/cyrus/sieve/z
+d cyrus root 0755 /var/lib/cyrus/socket
+d cyrus mail 0755 /var/lib/cyrus/user
+# if only i could: d cyrus mail 0755 /var/lib/cyrus/user/{a,b,c,d,e,f,g,h,i,j,k,l,m,n,o,p,q,r,s,t,u,v,w,x,y,z}
+d cyrus mail 0755 /var/lib/cyrus/user/a
+d cyrus mail 0755 /var/lib/cyrus/user/b
+d cyrus mail 0755 /var/lib/cyrus/user/c
+d cyrus mail 0755 /var/lib/cyrus/user/d
+d cyrus mail 0755 /var/lib/cyrus/user/e
+d cyrus mail 0755 /var/lib/cyrus/user/f
+d cyrus mail 0755 /var/lib/cyrus/user/g
+d cyrus mail 0755 /var/lib/cyrus/user/h
+d cyrus mail 0755 /var/lib/cyrus/user/i
+d cyrus mail 0755 /var/lib/cyrus/user/j
+d cyrus mail 0755 /var/lib/cyrus/user/k
+d cyrus mail 0755 /var/lib/cyrus/user/l
+d cyrus mail 0755 /var/lib/cyrus/user/m
+d cyrus mail 0755 /var/lib/cyrus/user/n
+d cyrus mail 0755 /var/lib/cyrus/user/o
+d cyrus mail 0755 /var/lib/cyrus/user/p
+d cyrus mail 0755 /var/lib/cyrus/user/q
+d cyrus mail 0755 /var/lib/cyrus/user/r
+d cyrus mail 0755 /var/lib/cyrus/user/s
+d cyrus mail 0755 /var/lib/cyrus/user/t
+d cyrus mail 0755 /var/lib/cyrus/user/u
+d cyrus mail 0755 /var/lib/cyrus/user/v
+d cyrus mail 0755 /var/lib/cyrus/user/w
+d cyrus mail 0755 /var/lib/cyrus/user/x
+d cyrus mail 0755 /var/lib/cyrus/user/y
+d cyrus mail 0755 /var/lib/cyrus/user/z
+d root root 0755 /var/spool/cyrus
+d cyrus mail 0750 /var/spool/cyrus/mail
+d cyrus mail 0750 /var/spool/cyrus/news