| [vhffs-dev] [2255] updated courier configuration against courier in Debian Wheezy |
[ Thread Index |
Date Index
| More vhffs.org/vhffs-dev Archives
]
Revision: 2255
Author: gradator
Date: 2014-12-13 19:14:03 +0100 (Sat, 13 Dec 2014)
Log Message:
-----------
updated courier configuration against courier in Debian Wheezy
Modified Paths:
--------------
trunk/vhffs-doc/config/courier/authpgsqlrc
trunk/vhffs-doc/config/courier/imapd
trunk/vhffs-doc/config/courier/imapd-ssl
trunk/vhffs-doc/config/courier/pop3d
trunk/vhffs-doc/config/courier/pop3d-ssl
Modified: trunk/vhffs-doc/config/courier/authpgsqlrc
===================================================================
--- trunk/vhffs-doc/config/courier/authpgsqlrc 2014-12-13 17:00:34 UTC (rev 2254)
+++ trunk/vhffs-doc/config/courier/authpgsqlrc 2014-12-13 18:14:03 UTC (rev 2255)
@@ -58,18 +58,18 @@
# The name of the table containing your user data. See README.authmysqlrc
# for the required fields in this table (both MySQL and Postgress use the
# same suggested layout.
-#
-# PGSQL_USER_TABLE passwd
+#PGSQL_USER_TABLE passwd
+
##NAME: PGSQL_CRYPT_PWFIELD:0
#
# Either PGSQL_CRYPT_PWFIELD or PGSQL_CLEAR_PWFIELD must be defined. Both
# are OK too. crypted passwords go into PGSQL_CRYPT_PWFIELD, cleartext
# passwords go into PGSQL_CLEAR_PWFIELD. Cleartext passwords allow
# CRAM-MD5 authentication to be implemented.
-#
-# PGSQL_CRYPT_PWFIELD crypt
+#PGSQL_CRYPT_PWFIELD crypt
+
##NAME: PGSQL_CLEAR_PWFIELD:0
#
#
@@ -89,34 +89,34 @@
#
# PGSQL_UID_FIELD - contains the numerical userid of the account
#
-# PGSQL_UID_FIELD uid
+#PGSQL_UID_FIELD uid
##NAME: PGSQL_GID_FIELD:0
#
# Numerical groupid of the account
-#
-# PGSQL_GID_FIELD gid
+#PGSQL_GID_FIELD gid
+
##NAME: PGSQL_LOGIN_FIELD:0
#
# The login id, default is id. Basically the query is:
#
# SELECT PGSQL_UID_FIELD, PGSQL_GID_FIELD, ... WHERE id='loginid'
#
-#
-# PGSQL_LOGIN_FIELD id
+#PGSQL_LOGIN_FIELD id
+
##NAME: PGSQL_HOME_FIELD:0
#
-#
-# PGSQL_HOME_FIELD home
+#PGSQL_HOME_FIELD home
+
##NAME: PGSQL_NAME_FIELD:0
#
# The user's name (optional)
-#
-# PGSQL_NAME_FIELD name
+#PGSQL_NAME_FIELD name
+
##NAME: PGSQL_MAILDIR_FIELD:0
#
# This is an optional field, and can be used to specify an arbitrary
@@ -212,9 +212,9 @@
# WHERE popbox.local_part = '$(local_part)' \
# AND popbox.domain_name = '$(domain)' \
# AND popbox.domain_name = domain.domain_name
-
PGSQL_SELECT_CLAUSE SELECT lp.localpart||'@'||mx.domain, lp.password, '', 102, 104, '/data/mail/boxes/'||substr(mx.domain,1,1)||'/'||substr(mx.domain,2,1)||'/'||mx.domain||'/'||substr(lp.localpart,1,1)||'/'||lp.localpart, 'Maildir', '', '', '' FROM vhffs_mx mx INNER JOIN vhffs_mx_localpart lp ON lp.mx_id=mx.mx_id INNER JOIN vhffs_mx_box b ON b.localpart_id=lp.localpart_id WHERE b.state=6 AND lp.localpart='$(local_part)' AND mx.domain='$(domain)' AND ( ('$(service)' LIKE 'pop%' AND b.allowpop=true) OR ('$(service)' LIKE 'imap%' AND b.allowimap=true) )
+
##NAME: PGSQL_ENUMERATE_CLAUSE:1
#
# {EXPERIMENTAL}
@@ -259,5 +259,4 @@
# WHERE local_part='$(local_part)' \
# AND domain_name='$(domain)'
#
-
PGSQL_CHPASS_CLAUSE UPDATE vhffs_mx_localpart lp SET password='$(newpass_crypt)' FROM vhffs_mx mx INNER JOIN vhffs_mx_localpart lpbis ON lpbis.mx_id=mx.mx_id INNER JOIN vhffs_mx_box b ON b.localpart_id=lpbis.localpart_id WHERE b.state=6 AND mx.mx_id=lp.mx_id AND lp.localpart='$(local_part)' AND mx.domain='$(domain)'
Modified: trunk/vhffs-doc/config/courier/imapd
===================================================================
--- trunk/vhffs-doc/config/courier/imapd 2014-12-13 17:00:34 UTC (rev 2254)
+++ trunk/vhffs-doc/config/courier/imapd 2014-12-13 18:14:03 UTC (rev 2255)
@@ -1,4 +1,4 @@
-##VERSION: $Id: imapd.dist.in,v 1.41 2008/06/21 16:01:23 mrsam Exp $
+##VERSION: $Id: imapd.dist.in 159 2011-11-14 02:07:00Z mrsam $
#
# imapd created from imapd.dist by sysconftool
#
@@ -51,13 +51,13 @@
# Maximum number of IMAP servers started
#
-MAXDAEMONS=40
+MAXDAEMONS=200
##NAME: MAXPERIP:0
#
# Maximum number of connections to accept from the same IP address
-MAXPERIP=20
+MAXPERIP=10
##NAME: PIDFILE:0
#
@@ -341,7 +341,25 @@
IMAP_MOVE_EXPUNGE_TO_TRASH=0
+##NAME: IMAP_LOG_DELETIONS:0
+#
+#
+# Set IMAP_LOG_DELETIONS to log all message deletions to syslog.
+#
+# IMAP_LOG_DELETIONS=1
+##NAME: IMAPDEBUGFILE:0
+#
+# IMAPDEBUGFILE="imaplog.dat"
+#
+# Generate diagnostic logging of IMAP commands.
+#
+# Set this globally, restart the server. Touch this file in an account's
+# maildir directory, and Courier-IMAP will append all IMAP commands received
+# for new sessions for this account. NOTE: existing IMAP sessions are not
+# affected, only new IMAP logins.
+
+
##NAME: OUTBOX:0
#
# The next set of options deal with the "Outbox" enhancement.
Modified: trunk/vhffs-doc/config/courier/imapd-ssl
===================================================================
--- trunk/vhffs-doc/config/courier/imapd-ssl 2014-12-13 17:00:34 UTC (rev 2254)
+++ trunk/vhffs-doc/config/courier/imapd-ssl 2014-12-13 18:14:03 UTC (rev 2255)
@@ -1,4 +1,4 @@
-##VERSION: $Id: imapd-ssl.dist.in,v 1.22 2009/08/12 22:25:49 mrsam Exp $
+##VERSION: $Id: imapd-ssl.dist.in 64 2011-04-11 11:01:33Z mrsam $
#
# imapd-ssl created from imapd-ssl.dist by sysconftool
#
@@ -110,7 +110,6 @@
#
# OpenSSL:
#
-# SSL2 - SSLv2
# SSL3 - SSLv3
# SSL23 - either SSLv2 or SSLv3 (also TLS1, it seems)
# TLS1 - TLS1
@@ -147,11 +146,9 @@
#
# OpenSSL:
#
-# TLS_CIPHER_LIST="SSLv3:TLSv1:!SSLv2:HIGH:!LOW:!MEDIUM:!EXP:!NULL:!aNULL@STRENGTH"
+# TLS_CIPHER_LIST="SSLv3:TLSv1:HIGH:!LOW:!MEDIUM:!EXP:!NULL:!aNULL@STRENGTH"
#
-# To enable SSL2, remove the obvious "!SSLv2" part from the above list.
#
-#
# GnuTLS:
#
# TLS_CIPHER_LIST="HIGH:MEDIUM"
Modified: trunk/vhffs-doc/config/courier/pop3d
===================================================================
--- trunk/vhffs-doc/config/courier/pop3d 2014-12-13 17:00:34 UTC (rev 2254)
+++ trunk/vhffs-doc/config/courier/pop3d 2014-12-13 18:14:03 UTC (rev 2255)
@@ -1,11 +1,11 @@
-##VERSION: $Id: pop3d.dist.in,v 1.16 2005/07/05 12:42:51 mrsam Exp $
+##VERSION: $Id: pop3d.dist.in 159 2011-11-14 02:07:00Z mrsam $
#
# pop3d created from pop3d.dist by sysconftool
#
# Do not alter lines that begin with ##, they are used when upgrading
# this configuration.
#
-# Copyright 1998 - 2004 Double Precision, Inc. See COPYING for
+# Copyright 1998 - 2011 Double Precision, Inc. See COPYING for
# distribution information.
#
# Courier POP3 daemon configuration
@@ -95,6 +95,15 @@
ADDRESS=0
+##NAME: AUTHSERVICE:0
+#
+# It's possible to authenticate using a different 'service' parameter
+# depending on the connection's port. This only works with authentication
+# modules that use the 'service' parameter, such as PAM. Example:
+#
+# AUTHSERVICE110=pop3
+# AUTHSERVICE995=pop3s
+
##NAME: TCPDOPTS:0
#
# Other couriertcpd(1) options. The following defaults should be fine.
@@ -139,6 +148,14 @@
POP3DSTART=YES
+##NAME: POP3_LOG_DELETIONS:0
+#
+#
+# Set POP3_LOG_DELETIONS to log all message deletions to syslog.
+#
+# POP3_LOG_DELETIONS=1
+
+
##NAME: MAILDIRPATH:0
#
# MAILDIRPATH - directory name of the maildir directory.
Modified: trunk/vhffs-doc/config/courier/pop3d-ssl
===================================================================
--- trunk/vhffs-doc/config/courier/pop3d-ssl 2014-12-13 17:00:34 UTC (rev 2254)
+++ trunk/vhffs-doc/config/courier/pop3d-ssl 2014-12-13 18:14:03 UTC (rev 2255)
@@ -1,4 +1,4 @@
-##VERSION: $Id: pop3d-ssl.dist.in,v 1.23 2009/08/12 22:25:49 mrsam Exp $
+##VERSION: $Id: pop3d-ssl.dist.in 64 2011-04-11 11:01:33Z mrsam $
#
# pop3d-ssl created from pop3d-ssl.dist by sysconftool
#
@@ -95,7 +95,6 @@
#
# OpenSSL:
#
-# SSL2 - SSLv2
# SSL3 - SSLv3
# SSL23 - either SSLv2 or SSLv3 (also TLS1, it seems)
# TLS1 - TLS1
@@ -134,11 +133,9 @@
#
# OpenSSL:
#
-# TLS_CIPHER_LIST="SSLv3:TLSv1:!SSLv2:HIGH:!LOW:!MEDIUM:!EXP:!NULL:!aNULL@STRENGTH"
+# TLS_CIPHER_LIST="SSLv3:TLSv1:HIGH:!LOW:!MEDIUM:!EXP:!NULL:!aNULL@STRENGTH"
#
-# To enable SSL2, remove the obvious "!SSLv2" part from the above list.
#
-#
# GnuTLS:
#
# TLS_CIPHER_LIST="HIGH:MEDIUM"