1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122 123 124 125 126 127 128 129 130 131 132 133 134 135 136 137 138 139 140 141 142 143 144 145 146 147 148 149 150 151 152 153 154 155 156 157 158 159 160 161 162 163 164 165 166 167 168 169 170 171 172 173 174 175 176 177 178 179 180 181 182 183 184 185 186 187 188 189 190 191 192 193 194 195 196 197 198 199 200 201 202 203 204 205 206
|
Subject: Fix default configuration for Debian
From: "Stefan Hornburg (Racke)" <racke@linuxia.de>
Soren Stoutner <soren@debian.org>
Last-Update: 2024-12-30
--- a/courier/ldapaliasrc.dist
+++ b/courier/ldapaliasrc.dist
@@ -48,7 +48,7 @@ LDAP_ALIAS 0
#
# Location of your LDAP server:
-LDAP_URI ldap://ldap.example.com:389
+LDAP_URI ldap://localhost:389
##NAME: LDAP_NUMPROCS:0
#
--- a/courier/module.esmtp/esmtpd-ssl.dist.in
+++ b/courier/module.esmtp/esmtpd-ssl.dist.in
@@ -123,7 +123,7 @@ SSLPIDFILE=@piddir@/esmtpd-ssl.pid
#
# Whether or not to start ESMTP over SSL on esmtps port:
-ESMTPDSSLSTART=NO
+ESMTPDSSLSTART=YES
##NAME: COURIERTLS:0
#
@@ -146,9 +146,9 @@ COURIERTLS=@bindir@/couriertls
#
# Set TLS protocol priority settings (GnuTLS only)
#
-# DEFAULT: NORMAL:-CTYPE-OPENPGP
+# DEFAULT: NORMAL
#
-# TLS_PRIORITY="NORMAL:-CTYPE-OPENPGP"
+# TLS_PRIORITY="NORMAL"
#
# This setting is also used to select the available ciphers.
#
--- a/courier/module.esmtp/esmtpd.dist.in
+++ b/courier/module.esmtp/esmtpd.dist.in
@@ -49,13 +49,13 @@ BOFHCHECKDNS=1
#
# Set BOFHNOEXP to 1 to disable EXPN
-BOFHNOEXPN=0
+BOFHNOEXPN=1
##NAME: BOFHNOVRFY:1
#
# Set BOFHNOVERIFY to disable VRFY
-BOFHNOVRFY=0
+BOFHNOVRFY=1
##NAME: TARPIT:1
#
@@ -135,9 +135,9 @@ COURIERTLS=@bindir@/couriertls
#
# Set TLS protocol priority settings (GnuTLS only)
#
-# DEFAULT: NORMAL:-CTYPE-OPENPGP
+# DEFAULT: NORMAL
#
-# TLS_PRIORITY="NORMAL:-CTYPE-OPENPGP"
+# TLS_PRIORITY="NORMAL"
##NAME: TLS_PROTOCOL:0
#
@@ -489,4 +489,4 @@ ESMTPAUTH_TLS_WEBADMIN="PLAIN LOGIN CRAM
# with enough platforms so that people get annoyed with having to flip it to
# YES every time.
-ESMTPDSTART=NO
+ESMTPDSTART=YES
--- a/courier/webmlmrc.dist.in
+++ b/courier/webmlmrc.dist.in
@@ -12,7 +12,7 @@
# executes the web cgi-bin scripts (nobody, in the default Apache
# configuration).
-PORT=@localstatedir@/webmlm
+PORT=@piddir@/webmlm
##NAME: PIDFILE:0
--- a/libs/imap/imapd-ssl.dist.in
+++ b/libs/imap/imapd-ssl.dist.in
@@ -72,7 +72,7 @@ SSLLOGGEROPTS="-name=imapd-ssl"
#
# Whether or not to start IMAP over SSL on simap port:
-IMAPDSSLSTART=NO
+IMAPDSSLSTART=YES
##NAME: IMAPDSTARTTLS:0
#
@@ -110,7 +110,7 @@ COURIERTLS=@bindir@/couriertls
#
# Set TLS protocol priority settings
#
-# DEFAULT: NORMAL:-CTYPE-OPENPGP
+# DEFAULT: NORMAL
#
# This setting is also used to select the available ciphers.
#
--- a/libs/imap/imapd.dist.in
+++ b/libs/imap/imapd.dist.in
@@ -57,7 +57,7 @@ MAXDAEMONS=40
#
# Maximum number of connections to accept from the same IP address
-MAXPERIP=4
+MAXPERIP=20
##NAME: PIDFILE:0
#
@@ -263,7 +263,7 @@ IMAP_UMASK=022
# sorting (by my calculations you have to have at least 100,000 messages
# in a single folder, for that to happen).
-IMAP_ULIMITD=65536
+IMAP_ULIMITD=131072
##NAME: IMAP_USELOCKS:0
#
@@ -469,7 +469,7 @@ HEADERFROM=X-IMAP-Sender
# The default setting is going to be NO, so you'll have to manually flip
# it to yes.
-IMAPDSTART=NO
+IMAPDSTART=YES
##NAME: MAILDIRPATH:0
#
--- a/libs/imap/pop3d-ssl.dist.in
+++ b/libs/imap/pop3d-ssl.dist.in
@@ -61,7 +61,7 @@ SSLLOGGEROPTS="-name=pop3d-ssl"
#
# Whether or not to start POP3 over SSL on spop3 port:
-POP3DSSLSTART=NO
+POP3DSSLSTART=YES
##NAME: POP3_STARTTLS:0
#
@@ -95,9 +95,9 @@ COURIERTLS=@bindir@/couriertls
#
# Set TLS protocol priority settings
#
-# DEFAULT: NORMAL:-CTYPE-OPENPGP
+# DEFAULT: NORMAL
#
-# TLS_PRIORITY="NORMAL:-CTYPE-OPENPGP"
+# TLS_PRIORITY="NORMAL"
#
# This setting is also used to select the available ciphers.
#
--- a/libs/imap/pop3d.dist.in
+++ b/libs/imap/pop3d.dist.in
@@ -149,7 +149,7 @@ LOGGEROPTS="-name=pop3d"
# with enough platforms so that people get annoyed with having to flip it to
# YES every time.
-POP3DSTART=NO
+POP3DSTART=YES
##NAME: POP3_LOG_DELETIONS:0
#
--- a/courier/configure.ac
+++ b/courier/configure.ac
@@ -122,6 +122,9 @@ AC_ARG_WITH(transport,
AC_SUBST(transport)
+AC_ARG_WITH(piddir, [ --with-piddir Directory where PID files are located ], piddir="$withval", piddir=/var/run)
+AC_SUBST(piddir)
+
AC_MSG_CHECKING(for modules to compile)
dirlist=""
--- a/libs/tcpd/libcouriergnutls.c
+++ b/libs/tcpd/libcouriergnutls.c
@@ -254,7 +254,7 @@ ssl_context tls_create(int isserver, con
}
p->priority_list=safe_getenv(p, "TLS_PRIORITY",
- "NORMAL:-CTYPE-OPENPGP");
+ "NORMAL");
if ((certfile=strdup(safe_getenv(p, "TLS_CERTFILE", ""))) == NULL ||
(p->trustcerts=strdup(safe_getenv(p, "TLS_TRUSTCERTS", "")))
--- a/courier/courierd.dist.in
+++ b/courier/courierd.dist.in
@@ -282,9 +282,9 @@ ESMTP_PREFER_IPV6_MX=1
#
# Set TLS protocol priority settings
#
-# DEFAULT: NORMAL:-CTYPE-OPENPGP
+# DEFAULT: NORMAL
#
-# TLS_PRIORITY="NORMAL:-CTYPE-OPENPGP"
+# TLS_PRIORITY="NORMAL"
#
# This setting is also used to select the available ciphers.
#
|