dovecot-2.0: example-config: Added ".ext" extension for ldap/sql...
dovecot at dovecot.org
dovecot at dovecot.org
Fri Nov 6 01:39:41 EET 2009
details: http://hg.dovecot.org/dovecot-2.0/rev/32d007b5f41d
changeset: 10260:32d007b5f41d
user: Timo Sirainen <tss at iki.fi>
date: Thu Nov 05 18:39:36 2009 -0500
description:
example-config: Added ".ext" extension for ldap/sql/dict-sql/db config files.
This separates them from the rest of the config files that can be directly
included from conf.d/.
diffstat:
11 files changed, 403 insertions(+), 403 deletions(-)
doc/example-config/conf.d/auth.conf | 8 -
doc/example-config/dovecot-db.conf | 11 --
doc/example-config/dovecot-db.conf.ext | 11 ++
doc/example-config/dovecot-dict-sql.conf | 39 -------
doc/example-config/dovecot-dict-sql.conf.ext | 39 +++++++
doc/example-config/dovecot-ldap.conf | 139 --------------------------
doc/example-config/dovecot-ldap.conf.ext | 139 ++++++++++++++++++++++++++
doc/example-config/dovecot-sql.conf | 133 ------------------------
doc/example-config/dovecot-sql.conf.ext | 133 ++++++++++++++++++++++++
doc/example-config/dovecot.conf | 77 --------------
doc/example-config/dovecot.conf.ext | 77 ++++++++++++++
diffs (truncated from 873 to 300 lines):
diff -r e0db66c8b9a9 -r 32d007b5f41d doc/example-config/conf.d/auth.conf
--- a/doc/example-config/conf.d/auth.conf Thu Nov 05 18:01:06 2009 -0500
+++ b/doc/example-config/conf.d/auth.conf Thu Nov 05 18:39:36 2009 -0500
@@ -201,13 +201,13 @@ passdb pam {
# SQL database <doc/wiki/AuthDatabase.SQL.txt>
#passdb sql {
- # Path for SQL configuration file, see doc/dovecot-sql-example.conf
+ # Path for SQL configuration file, see example-config/dovecot-sql.conf.ext
#args =
#}
# LDAP database <doc/wiki/AuthDatabase.LDAP.txt>
#passdb ldap {
- # Path for LDAP configuration file, see doc/dovecot-ldap-example.conf
+ # Path for LDAP configuration file, see example-config/dovecot-ldap.conf.ext
#args =
#}
@@ -283,13 +283,13 @@ userdb passwd {
# SQL database <doc/wiki/AuthDatabase.SQL.txt>
#userdb sql {
- # Path for SQL configuration file, see doc/dovecot-sql-example.conf
+ # Path for SQL configuration file, see example-config/dovecot-sql.conf.ext
#args =
#}
# LDAP database <doc/wiki/AuthDatabase.LDAP.txt>
#userdb ldap {
- # Path for LDAP configuration file, see doc/dovecot-ldap-example.conf
+ # Path for LDAP configuration file, see example-config/dovecot-ldap.conf.ext
#args =
#}
diff -r e0db66c8b9a9 -r 32d007b5f41d doc/example-config/dovecot-db.conf
--- a/doc/example-config/dovecot-db.conf Thu Nov 05 18:01:06 2009 -0500
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,11 +0,0 @@
-# Example DB_CONFIG for Berkeley DB. Typically dict_db_config setting is used
-# to point to this file.
-# http://www.oracle.com/technology/documentation/berkeley-db/db/ref/env/db_config.html
-
-# Maximum number of simultaneous transactions.
-set_tx_max 1000
-
-# http://www.oracle.com/technology/documentation/berkeley-db/db/ref/lock/max.html
-#set_lk_max_locks 1000
-#set_lk_max_lockers 1000
-#set_lk_max_objects 1000
diff -r e0db66c8b9a9 -r 32d007b5f41d doc/example-config/dovecot-db.conf.ext
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/doc/example-config/dovecot-db.conf.ext Thu Nov 05 18:39:36 2009 -0500
@@ -0,0 +1,11 @@
+# Example DB_CONFIG for Berkeley DB. Typically dict_db_config setting is used
+# to point to this file.
+# http://www.oracle.com/technology/documentation/berkeley-db/db/ref/env/db_config.html
+
+# Maximum number of simultaneous transactions.
+set_tx_max 1000
+
+# http://www.oracle.com/technology/documentation/berkeley-db/db/ref/lock/max.html
+#set_lk_max_locks 1000
+#set_lk_max_lockers 1000
+#set_lk_max_objects 1000
diff -r e0db66c8b9a9 -r 32d007b5f41d doc/example-config/dovecot-dict-sql.conf
--- a/doc/example-config/dovecot-dict-sql.conf Thu Nov 05 18:01:06 2009 -0500
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,39 +0,0 @@
-#connect = host=localhost dbname=mails user=testuser password=pass
-
-# CREATE TABLE quota (
-# username varchar(100) not null,
-# bytes bigint not null default 0,
-# messages integer not null default 0,
-# primary key (username)
-# );
-
-map {
- pattern = priv/quota/storage
- table = quota
- username_field = username
- value_field = bytes
-}
-map {
- pattern = priv/quota/messages
- table = quota
- username_field = username
- value_field = messages
-}
-
-# CREATE TABLE expires (
-# username varchar(100) not null,
-# mailbox varchar(255) not null,
-# expire_stamp integer not null,
-# primary key (username, mailbox)
-# );
-
-map {
- pattern = shared/expire/$user/$mailbox
- table = expires
- value_field = expire_stamp
-
- fields {
- username = $user
- mailbox = $mailbox
- }
-}
diff -r e0db66c8b9a9 -r 32d007b5f41d doc/example-config/dovecot-dict-sql.conf.ext
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/doc/example-config/dovecot-dict-sql.conf.ext Thu Nov 05 18:39:36 2009 -0500
@@ -0,0 +1,39 @@
+#connect = host=localhost dbname=mails user=testuser password=pass
+
+# CREATE TABLE quota (
+# username varchar(100) not null,
+# bytes bigint not null default 0,
+# messages integer not null default 0,
+# primary key (username)
+# );
+
+map {
+ pattern = priv/quota/storage
+ table = quota
+ username_field = username
+ value_field = bytes
+}
+map {
+ pattern = priv/quota/messages
+ table = quota
+ username_field = username
+ value_field = messages
+}
+
+# CREATE TABLE expires (
+# username varchar(100) not null,
+# mailbox varchar(255) not null,
+# expire_stamp integer not null,
+# primary key (username, mailbox)
+# );
+
+map {
+ pattern = shared/expire/$user/$mailbox
+ table = expires
+ value_field = expire_stamp
+
+ fields {
+ username = $user
+ mailbox = $mailbox
+ }
+}
diff -r e0db66c8b9a9 -r 32d007b5f41d doc/example-config/dovecot-ldap.conf
--- a/doc/example-config/dovecot-ldap.conf Thu Nov 05 18:01:06 2009 -0500
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,139 +0,0 @@
-# This file is opened as root, so it should be owned by root and mode 0600.
-#
-# http://wiki.dovecot.org/AuthDatabase/LDAP
-#
-# NOTE: If you're not using authentication binds, you'll need to give
-# dovecot-auth read access to userPassword field in the LDAP server.
-# With OpenLDAP this is done by modifying /etc/ldap/slapd.conf. There should
-# already be something like this:
-
-# access to attribute=userPassword
-# by dn="<dovecot's dn>" read # add this
-# by anonymous auth
-# by self write
-# by * none
-
-# Space separated list of LDAP hosts to use. host:port is allowed too.
-#hosts =
-
-# LDAP URIs to use. You can use this instead of hosts list. Note that this
-# setting isn't supported by all LDAP libraries.
-#uris =
-
-# Distinguished Name - the username used to login to the LDAP server.
-# Leave it commented out to bind anonymously (useful with auth_bind=yes).
-#dn =
-
-# Password for LDAP server, if dn is specified.
-#dnpass =
-
-# Use SASL binding instead of the simple binding. Note that this changes
-# ldap_version automatically to be 3 if it's lower. Also note that SASL binds
-# and auth_bind=yes don't work together.
-#sasl_bind = no
-# SASL mechanism name to use.
-#sasl_mech =
-# SASL realm to use.
-#sasl_realm =
-# SASL authorization ID, ie. the dnpass is for this "master user", but the
-# dn is still the logged in user. Normally you want to keep this empty.
-#sasl_authz_id =
-
-# Use TLS to connect to the LDAP server.
-#tls = no
-# TLS options, currently supported only with OpenLDAP:
-#tls_ca_cert_file =
-#tls_ca_cert_dir =
-#tls_cert_file =
-#tls_key_file =
-#tls_cipher_suite =
-# Valid values: never, hard, demand, allow, try
-#tls_require_cert =
-
-# Use the given ldaprc path.
-#ldaprc_path =
-
-# LDAP library debug level as specified by LDAP_DEBUG_* in ldap_log.h.
-# -1 = everything. You may need to recompile OpenLDAP with debugging enabled
-# to get enough output.
-#debug_level = 0
-
-# Use authentication binding for verifying password's validity. This works by
-# logging into LDAP server using the username and password given by client.
-# The pass_filter is used to find the DN for the user. Note that the pass_attrs
-# is still used, only the password field is ignored in it. Before doing any
-# search, the binding is switched back to the default DN.
-#auth_bind = no
-
-# If authentication binding is used, you can save one LDAP request per login
-# if users' DN can be specified with a common template. The template can use
-# the standard %variables (see user_filter). Note that you can't
-# use any pass_attrs if you use this setting.
-#
-# If you use this setting, it's a good idea to use a different
-# dovecot-ldap.conf for userdb (it can even be a symlink, just as long as the
-# filename is different in userdb's args). That way one connection is used only
-# for LDAP binds and another connection is used for user lookups. Otherwise
-# the binding is changed to the default DN before each user lookup.
-#
-# For example:
-# auth_bind_userdn = cn=%u,ou=people,o=org
-#
-#auth_bind_userdn =
-
-# LDAP protocol version to use. Likely 2 or 3.
-#ldap_version = 3
-
-# LDAP base. %variables can be used here.
-# For example: dc=mail, dc=example, dc=org
-base =
-
-# Dereference: never, searching, finding, always
-#deref = never
-
-# Search scope: base, onelevel, subtree
-#scope = subtree
-
-# User attributes are given in LDAP-name=dovecot-internal-name list. The
-# internal names are:
-# uid - System UID
-# gid - System GID
-# home - Home directory
-# mail - Mail location
-#
-# There are also other special fields which can be returned, see
-# http://wiki.dovecot.org/UserDatabase/ExtraFields
-#user_attrs = homeDirectory=home,uidNumber=uid,gidNumber=gid
-
-# Filter for user lookup. Some variables can be used (see
-# http://wiki.dovecot.org/Variables for full list):
-# %u - username
-# %n - user part in user at domain, same as %u if there's no domain
-# %d - domain part in user at domain, empty if user there's no domain
-#user_filter = (&(objectClass=posixAccount)(uid=%u))
-
-# Password checking attributes:
-# user: Virtual user name (user at domain), if you wish to change the
-# user-given username to something else
-# password: Password, may optionally start with {type}, eg. {crypt}
-# There are also other special fields which can be returned, see
-# http://wiki.dovecot.org/PasswordDatabase/ExtraFields
-#pass_attrs = uid=user,userPassword=password
-
-# If you wish to avoid two LDAP lookups (passdb + userdb), you can use
-# userdb prefetch instead of userdb ldap in dovecot.conf. In that case you'll
-# also have to include user_attrs in pass_attrs field prefixed with "userdb_"
-# string. For example:
-#pass_attrs = uid=user,userPassword=password,\
-# homeDirectory=userdb_home,uidNumber=userdb_uid,gidNumber=userdb_gid
-
-# Filter for password lookups
-#pass_filter = (&(objectClass=posixAccount)(uid=%u))
-
-# Attributes and filter to get a list of all users
-#iterate_attrs = uid=user
-#iterate_filter = (objectClass=posixAccount)
-
-# Default password scheme. "{scheme}" before password overrides this.
-# List of supported schemes is in: http://wiki.dovecot.org/Authentication
-#default_pass_scheme = CRYPT
diff -r e0db66c8b9a9 -r 32d007b5f41d doc/example-config/dovecot-ldap.conf.ext
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/doc/example-config/dovecot-ldap.conf.ext Thu Nov 05 18:39:36 2009 -0500
@@ -0,0 +1,139 @@
+# This file is opened as root, so it should be owned by root and mode 0600.
+#
More information about the dovecot-cvs
mailing list