|
 |
3a72524 |
diff --git a/doc/examples/imapd_conf/normal.conf b/doc/examples/imapd_conf/normal.conf
|
|
|
a52db49 |
index 95b54e9..3935b77 100644
|
|
|
3a72524 |
--- a/doc/examples/imapd_conf/normal.conf
|
|
|
3a72524 |
+++ b/doc/examples/imapd_conf/normal.conf
|
|
|
3a72524 |
@@ -10,7 +10,7 @@ admins: cyrus
|
|
|
3a72524 |
###################################################################
|
|
|
3a72524 |
|
|
|
3a72524 |
# Configuration directory
|
|
|
3a72524 |
-configdirectory: /var/lib/cyrus
|
|
|
3a72524 |
+configdirectory: /var/lib/imap
|
|
|
3a72524 |
|
|
|
3a72524 |
# Directories for proc and lock files
|
|
|
3a72524 |
proc_path: /run/cyrus/proc
|
|
|
3a72524 |
@@ -19,18 +19,18 @@ mboxname_lockpath: /run/cyrus/lock
|
|
|
3a72524 |
# Locations for DB files
|
|
|
3a72524 |
# The following DB are recreated upon initialization, so should live in
|
|
|
3a72524 |
# ephemeral storage for best performance.
|
|
|
3a72524 |
-duplicate_db_path: /run/cyrus/deliver.db
|
|
|
3a72524 |
-ptscache_db_path: /run/cyrus/ptscache.db
|
|
|
3a72524 |
-statuscache_db_path: /run/cyrus/statuscache.db
|
|
|
3a72524 |
-tls_sessions_db_path: /run/cyrus/tls_sessions.db
|
|
|
3a72524 |
+duplicate_db_path: /run/cyrus/db/deliver.db
|
|
|
3a72524 |
+ptscache_db_path: /run/cyrus/db/ptscache.db
|
|
|
3a72524 |
+statuscache_db_path: /run/cyrus/db/statuscache.db
|
|
|
3a72524 |
+tls_sessions_db_path: /run/cyrus/db/tls_sessions.db
|
|
|
3a72524 |
|
|
|
3a72524 |
# Which partition to use for default mailboxes
|
|
|
3a72524 |
defaultpartition: default
|
|
|
3a72524 |
-partition-default: /var/spool/cyrus/mail
|
|
|
3a72524 |
+partition-default: /var/spool/imap
|
|
|
3a72524 |
|
|
|
3a72524 |
# If sieveusehomedir is false (the default), this directory is searched
|
|
|
3a72524 |
# for Sieve scripts.
|
|
|
3a72524 |
-sievedir: /var/spool/sieve
|
|
|
3a72524 |
+sievedir: /var/lib/imap/sieve
|
|
|
3a72524 |
|
|
|
3a72524 |
###################################################################
|
|
|
3a72524 |
## Important: KEEP THESE IN SYNC WITH cyrus.conf
|
|
|
3a72524 |
@@ -51,19 +51,16 @@ syslog_prefix: cyrus
|
|
|
3a72524 |
# Space-separated list of HTTP modules that will be enabled in
|
|
|
3a72524 |
# httpd(8). This option has no effect on modules that are disabled at
|
|
|
3a72524 |
# compile time due to missing dependencies (e.g. libical).
|
|
|
3a72524 |
-#
|
|
|
3a72524 |
-# Allowed values: caldav, carddav, domainkey, ischedule, rss
|
|
|
3a72524 |
-httpmodules: caldav carddav
|
|
|
3a72524 |
+# Fedora default: enable all modules besides admin
|
|
 |
89252d0 |
+httpmodules: caldav carddav domainkey freebusy ischedule rss tzdist webdav
|
|
|
3a72524 |
|
|
|
3a72524 |
# If enabled, the partitions will also be hashed, in addition to the
|
|
|
3a72524 |
# hashing done on configuration directories. This is recommended if one
|
|
|
3a72524 |
# partition has a very bushy mailbox tree.
|
|
|
3a72524 |
hashimapspool: true
|
|
|
3a72524 |
|
|
|
3a72524 |
-# Enable virtual domains
|
|
|
3a72524 |
-# and set default domain to localhost
|
|
|
3a72524 |
-virtdomains: yes
|
|
|
3a72524 |
-defaultdomain: localhost
|
|
|
3a72524 |
+# Disable virtual domains by default
|
|
|
3a72524 |
+virtdomains: off
|
|
|
3a72524 |
|
|
|
3a72524 |
###################################################################
|
|
|
3a72524 |
## User experience settings
|
|
|
a52db49 |
@@ -72,6 +69,14 @@ defaultdomain: localhost
|
|
|
3a72524 |
# Minimum time between POP mail fetches in minutes
|
|
|
3a72524 |
popminpoll: 1
|
|
|
3a72524 |
|
|
|
3a72524 |
+# Conversation support is required for jmap
|
|
|
3a72524 |
+conversations: 1
|
|
|
3a72524 |
+conversations_db: twoskip
|
|
|
3a72524 |
+
|
|
|
a52db49 |
+# This will default to on in 3.1, and improves compatibility with some Apple
|
|
|
a52db49 |
+# devices. Upstream https://github.com/cyrusimap/cyrus-imapd/issues/1556
|
|
|
a52db49 |
+specialusealways: 1
|
|
|
a52db49 |
+
|
|
|
3a72524 |
###################################################################
|
|
|
3a72524 |
## User Authentication settings
|
|
|
3a72524 |
###################################################################
|
|
|
a52db49 |
@@ -99,6 +104,12 @@ sasl_auto_transition: no
|
|
|
3a72524 |
## SSL/TLS Options
|
|
|
3a72524 |
###################################################################
|
|
|
3a72524 |
|
|
|
3a72524 |
+# These three files will automatically be generated by the systemd unit when
|
|
|
3a72524 |
+# the service starts for the first time.
|
|
|
3a72524 |
+tls_server_cert: /etc/pki/cyrus-imapd/cyrus-imapd.pem
|
|
|
3a72524 |
+tls_server_key: /etc/pki/cyrus-imapd/cyrus-imapd-key.pem
|
|
|
3a72524 |
+tls_client_ca_file: /etc/pki/cyrus-imapd/cyrus-imapd-ca.pem
|
|
|
3a72524 |
+
|
|
|
3a72524 |
# File containing the global certificate used for ALL services (imap,
|
|
|
3a72524 |
# pop3, lmtp, sieve)
|
|
|
3a72524 |
#tls_server_cert: /etc/ssl/certs/ssl-cert-snakeoil.pem
|
|
 |
0583d17 |
diff --git a/doc/examples/cyrus_conf/prefork.conf b/doc/examples/cyrus_conf/prefork.conf
|
|
|
0583d17 |
index 186fe66..ab97848 100644
|
|
|
0583d17 |
--- a/doc/examples/cyrus_conf/prefork.conf
|
|
|
0583d17 |
+++ b/doc/examples/cyrus_conf/prefork.conf
|
|
|
0583d17 |
@@ -19,8 +19,8 @@ SERVICES {
|
|
|
0583d17 |
# nntps cmd="nntpd -s" listen="nntps" prefork=1
|
|
|
0583d17 |
|
|
|
0583d17 |
# these are only necessary if using HTTP for CalDAV, CardDAV, or RSS
|
|
|
0583d17 |
-# http cmd="httpd" listen="http" prefork=3
|
|
|
0583d17 |
-# https cmd="httpd -s" listen="https" prefork=1
|
|
|
0583d17 |
+ http cmd="httpd" listen="http" prefork=3
|
|
|
0583d17 |
+ https cmd="httpd -s" listen="https" prefork=1
|
|
|
0583d17 |
|
|
|
0583d17 |
# at least one LMTP is required for delivery
|
|
|
0583d17 |
# lmtp cmd="lmtpd" listen="lmtp" prefork=0
|