From: Timo Sirainen <tss@iki.fi>
Date: Thu, 5 Nov 2009 23:39:36 +0000 (-0500)
Subject: example-config: Added ".ext" extension for ldap/sql/dict-sql/db config files.
X-Git-Tag: 2.0.alpha3~35
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=98e9efc6d6e4aaaff8ea70dc14a6c443d680601a;p=thirdparty%2Fdovecot%2Fcore.git

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/.

--HG--
branch : HEAD
---

diff --git a/doc/example-config/conf.d/auth.conf b/doc/example-config/conf.d/auth.conf
index 5695066edd..a89787d6ad 100644
--- a/doc/example-config/conf.d/auth.conf
+++ b/doc/example-config/conf.d/auth.conf
@@ -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 --git a/doc/example-config/dovecot-db.conf b/doc/example-config/dovecot-db.conf.ext
similarity index 100%
rename from doc/example-config/dovecot-db.conf
rename to doc/example-config/dovecot-db.conf.ext
diff --git a/doc/example-config/dovecot-dict-sql.conf b/doc/example-config/dovecot-dict-sql.conf.ext
similarity index 100%
rename from doc/example-config/dovecot-dict-sql.conf
rename to doc/example-config/dovecot-dict-sql.conf.ext
diff --git a/doc/example-config/dovecot-ldap.conf b/doc/example-config/dovecot-ldap.conf.ext
similarity index 94%
rename from doc/example-config/dovecot-ldap.conf
rename to doc/example-config/dovecot-ldap.conf.ext
index 0a3a881ac0..9e305dfa6e 100644
--- a/doc/example-config/dovecot-ldap.conf
+++ b/doc/example-config/dovecot-ldap.conf.ext
@@ -71,10 +71,10 @@
 # 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.
+# dovecot-ldap.conf.ext 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
diff --git a/doc/example-config/dovecot-sql.conf b/doc/example-config/dovecot-sql.conf.ext
similarity index 100%
rename from doc/example-config/dovecot-sql.conf
rename to doc/example-config/dovecot-sql.conf.ext
diff --git a/doc/example-config/dovecot.conf b/doc/example-config/dovecot.conf.ext
similarity index 100%
rename from doc/example-config/dovecot.conf
rename to doc/example-config/dovecot.conf.ext