Configuration of the Cyrus databases is now runtime. The cyrus db

backend used for each database can be specified with an imapd.conf
option.

6 files changed, 108 insertions, 12 deletions

diff --git a/mail/cyrus-imapd22/Makefile b/mail/cyrus-imapd22/Makefile
index 4cc4e171a1f9..32f1c5d70f90 100644
--- a/mail/cyrus-imapd22/Makefile
+++ b/mail/cyrus-imapd22/Makefile
@@ -59,10 +59,6 @@ CONFIGURE_ARGS+=--with-bdb-incdir=${LOCALBASE}/include/db42 --with-bdb=db-4.2
 BROKEN=		"WITH_BDB_VER must be 3, 4, 41 or 42"
 .endif
 
-.if defined(WITHOUT_SKIPLIST)
-CONFIGURE_ARGS+=--with-mboxlist-db=berkeley --with-seen-db=flat
-.endif
-
 .if defined(WITH_NNTP)
 CONFIGURE_ARGS+=--enable-nntp
 PLIST_SUB+=	NNTP=""
diff --git a/mail/cyrus-imapd22/files/imapd.conf b/mail/cyrus-imapd22/files/imapd.conf
index 36794aeb8f6f..399df35d78b7 100644
--- a/mail/cyrus-imapd22/files/imapd.conf
+++ b/mail/cyrus-imapd22/files/imapd.conf
@@ -256,6 +256,42 @@ sievedir: /var/imap/sieve
 #
 #sieve_maxscripts: 5
 
+# The cyrusdb backend to use for mailbox annotations.
+# Allowed values: berkeley, skiplist
+#
+#annotation_db: skiplist
+
+# The cyrusdb backend to use for the duplicate delivery suppression
+# and sieve.
+# Allowed values: berkeley, berkeley-nosync, skiplist
+#
+#duplicate_db: berkeley-nosync
+
+# The cyrusdb backend to use for the mailbox list.
+# Allowed values: flat, berkeley, skiplist
+#
+#mboxlist_db: skiplist
+
+# The cyrusdb backend to use for the pts cache.
+# Allowed values: berkeley, skiplist
+#
+#ptscache_db: berkeley
+
+# The cyrusdb backend to use for the seen state.
+# Allowed values: flat, berkeley, skiplist
+#
+#seenstate_db: skiplist
+
+# The cyrusdb backend to use for the subscriptions list.
+# Allowed values: flat, berkeley, skiplist
+#
+#subscription_db: flat
+
+# The cyrusdb backend to use for the TLS cache.
+# Allowed values: berkeley, berkeley-nosync, skiplist
+#
+#tlscache_db: berkeley-nosync
+
 # Maximum SSF (security strength factor) that the server will allow a
 # client to negotiate.
 #
diff --git a/mail/cyrus-imapd23/Makefile b/mail/cyrus-imapd23/Makefile
index 4cc4e171a1f9..32f1c5d70f90 100644
--- a/mail/cyrus-imapd23/Makefile
+++ b/mail/cyrus-imapd23/Makefile
@@ -59,10 +59,6 @@ CONFIGURE_ARGS+=--with-bdb-incdir=${LOCALBASE}/include/db42 --with-bdb=db-4.2
 BROKEN=		"WITH_BDB_VER must be 3, 4, 41 or 42"
 .endif
 
-.if defined(WITHOUT_SKIPLIST)
-CONFIGURE_ARGS+=--with-mboxlist-db=berkeley --with-seen-db=flat
-.endif
-
 .if defined(WITH_NNTP)
 CONFIGURE_ARGS+=--enable-nntp
 PLIST_SUB+=	NNTP=""
diff --git a/mail/cyrus-imapd23/files/imapd.conf b/mail/cyrus-imapd23/files/imapd.conf
index 36794aeb8f6f..399df35d78b7 100644
--- a/mail/cyrus-imapd23/files/imapd.conf
+++ b/mail/cyrus-imapd23/files/imapd.conf
@@ -256,6 +256,42 @@ sievedir: /var/imap/sieve
 #
 #sieve_maxscripts: 5
 
+# The cyrusdb backend to use for mailbox annotations.
+# Allowed values: berkeley, skiplist
+#
+#annotation_db: skiplist
+
+# The cyrusdb backend to use for the duplicate delivery suppression
+# and sieve.
+# Allowed values: berkeley, berkeley-nosync, skiplist
+#
+#duplicate_db: berkeley-nosync
+
+# The cyrusdb backend to use for the mailbox list.
+# Allowed values: flat, berkeley, skiplist
+#
+#mboxlist_db: skiplist
+
+# The cyrusdb backend to use for the pts cache.
+# Allowed values: berkeley, skiplist
+#
+#ptscache_db: berkeley
+
+# The cyrusdb backend to use for the seen state.
+# Allowed values: flat, berkeley, skiplist
+#
+#seenstate_db: skiplist
+
+# The cyrusdb backend to use for the subscriptions list.
+# Allowed values: flat, berkeley, skiplist
+#
+#subscription_db: flat
+
+# The cyrusdb backend to use for the TLS cache.
+# Allowed values: berkeley, berkeley-nosync, skiplist
+#
+#tlscache_db: berkeley-nosync
+
 # Maximum SSF (security strength factor) that the server will allow a
 # client to negotiate.
 #
diff --git a/mail/cyrus-imapd24/Makefile b/mail/cyrus-imapd24/Makefile
index 4cc4e171a1f9..32f1c5d70f90 100644
--- a/mail/cyrus-imapd24/Makefile
+++ b/mail/cyrus-imapd24/Makefile
@@ -59,10 +59,6 @@ CONFIGURE_ARGS+=--with-bdb-incdir=${LOCALBASE}/include/db42 --with-bdb=db-4.2
 BROKEN=		"WITH_BDB_VER must be 3, 4, 41 or 42"
 .endif
 
-.if defined(WITHOUT_SKIPLIST)
-CONFIGURE_ARGS+=--with-mboxlist-db=berkeley --with-seen-db=flat
-.endif
-
 .if defined(WITH_NNTP)
 CONFIGURE_ARGS+=--enable-nntp
 PLIST_SUB+=	NNTP=""
diff --git a/mail/cyrus-imapd24/files/imapd.conf b/mail/cyrus-imapd24/files/imapd.conf
index 36794aeb8f6f..399df35d78b7 100644
--- a/mail/cyrus-imapd24/files/imapd.conf
+++ b/mail/cyrus-imapd24/files/imapd.conf
@@ -256,6 +256,42 @@ sievedir: /var/imap/sieve
 #
 #sieve_maxscripts: 5
 
+# The cyrusdb backend to use for mailbox annotations.
+# Allowed values: berkeley, skiplist
+#
+#annotation_db: skiplist
+
+# The cyrusdb backend to use for the duplicate delivery suppression
+# and sieve.
+# Allowed values: berkeley, berkeley-nosync, skiplist
+#
+#duplicate_db: berkeley-nosync
+
+# The cyrusdb backend to use for the mailbox list.
+# Allowed values: flat, berkeley, skiplist
+#
+#mboxlist_db: skiplist
+
+# The cyrusdb backend to use for the pts cache.
+# Allowed values: berkeley, skiplist
+#
+#ptscache_db: berkeley
+
+# The cyrusdb backend to use for the seen state.
+# Allowed values: flat, berkeley, skiplist
+#
+#seenstate_db: skiplist
+
+# The cyrusdb backend to use for the subscriptions list.
+# Allowed values: flat, berkeley, skiplist
+#
+#subscription_db: flat
+
+# The cyrusdb backend to use for the TLS cache.
+# Allowed values: berkeley, berkeley-nosync, skiplist
+#
+#tlscache_db: berkeley-nosync
+
 # Maximum SSF (security strength factor) that the server will allow a
 # client to negotiate.
 #