From ead52d505615096a69c0d5a7eca5840133707631 Mon Sep 17 00:00:00 2001 From: Joe Orton Date: Wed, 15 Jan 2025 17:12:37 +0000 Subject: [PATCH] - update the default cyrus.conf to enable idled Resolves: RHEL-61130 --- patch-cyrus-default-configs | 43 +++++++++++++++++++++---------------- 1 file changed, 24 insertions(+), 19 deletions(-) diff --git a/patch-cyrus-default-configs b/patch-cyrus-default-configs index 31c3647..adc8d7d 100644 --- a/patch-cyrus-default-configs +++ b/patch-cyrus-default-configs @@ -1,7 +1,27 @@ -diff --git a/doc/examples/imapd_conf/normal.conf b/doc/examples/imapd_conf/normal.conf -index 95b54e9..3935b77 100644 ---- a/doc/examples/imapd_conf/normal.conf -+++ b/doc/examples/imapd_conf/normal.conf +diff -uap cyrus-imapd-3.8.3/doc/examples/cyrus_conf/prefork.conf.2 cyrus-imapd-3.8.3/doc/examples/cyrus_conf/prefork.conf +--- cyrus-imapd-3.8.3/doc/examples/cyrus_conf/prefork.conf.2 2024-04-26 01:59:22.000000000 +0100 ++++ cyrus-imapd-3.8.3/doc/examples/cyrus_conf/prefork.conf 2025-01-15 15:56:40.112544167 +0000 +@@ -19,8 +19,8 @@ SERVICES { + # nntps cmd="nntpd -s" listen="nntps" prefork=1 + + # these are only necessary if using HTTP for CalDAV, CardDAV, or RSS +-# http cmd="httpd" listen="http" prefork=3 +-# https cmd="httpd -s" listen="https" prefork=1 ++ http cmd="httpd" listen="http" prefork=3 ++ https cmd="httpd -s" listen="https" prefork=1 + + # at least one LMTP is required for delivery + # lmtp cmd="lmtpd" listen="lmtp" prefork=0 +@@ -51,5 +51,5 @@ EVENTS { + + DAEMON { + # this is only necessary if using idled for IMAP IDLE +-# idled cmd="idled" ++ idled cmd="idled" + } +diff -uap cyrus-imapd-3.8.3/doc/examples/imapd_conf/normal.conf.2 cyrus-imapd-3.8.3/doc/examples/imapd_conf/normal.conf +--- cyrus-imapd-3.8.3/doc/examples/imapd_conf/normal.conf.2 2024-04-08 04:46:02.000000000 +0100 ++++ cyrus-imapd-3.8.3/doc/examples/imapd_conf/normal.conf 2025-01-15 15:55:44.361093153 +0000 @@ -10,7 +10,7 @@ admins: cyrus ################################################################### @@ -88,18 +108,3 @@ index 95b54e9..3935b77 100644 # File containing the global certificate used for ALL services (imap, # pop3, lmtp, sieve) #tls_server_cert: /etc/ssl/certs/ssl-cert-snakeoil.pem -diff --git a/doc/examples/cyrus_conf/prefork.conf b/doc/examples/cyrus_conf/prefork.conf -index 186fe66..ab97848 100644 ---- a/doc/examples/cyrus_conf/prefork.conf -+++ b/doc/examples/cyrus_conf/prefork.conf -@@ -19,8 +19,8 @@ SERVICES { - # nntps cmd="nntpd -s" listen="nntps" prefork=1 - - # these are only necessary if using HTTP for CalDAV, CardDAV, or RSS --# http cmd="httpd" listen="http" prefork=3 --# https cmd="httpd -s" listen="https" prefork=1 -+ http cmd="httpd" listen="http" prefork=3 -+ https cmd="httpd -s" listen="https" prefork=1 - - # at least one LMTP is required for delivery - # lmtp cmd="lmtpd" listen="lmtp" prefork=0