global: Add names for passdb/userdb { .. }

dovecot · Jan 18, 2024 · 6a7b5e5 · 6a7b5e5
1 parent 3c24151
commit 6a7b5e5
Show file tree

Hide file tree

Showing 38 changed files with 111 additions and 111 deletions.
diff --git a/source/admin_manual/debugging/debugging_rawlog.rst b/source/admin_manual/debugging/debugging_rawlog.rst
@@ -94,7 +94,7 @@ If your userdb can't return a home directory directly, with v2.1+ you can add:
 
 .. code-block:: none
 
-   userdb {
+   userdb db1 {
       # ...
       default_fields = home=/home/%u
       # or temporarily even e.g. default_fields = home=/tmp/temp-home

diff --git a/source/configuration_manual/authentication/allow_nets.rst b/source/configuration_manual/authentication/allow_nets.rst
@@ -35,7 +35,7 @@ Postfix to verify the email account:
 
 .. code-block:: none
 
-  passdb {
+  passdb db1 {
     driver = static
     args = password=test allow_nets=local,127.0.0.1/32
   }

diff --git a/...e/configuration_manual/authentication/authentication_via_remote_imap_server.rst b/...e/configuration_manual/authentication/authentication_via_remote_imap_server.rst
@@ -28,7 +28,7 @@ Authenticates users against remote IMAP server in IP address 192.168.1.123:
 
 .. code-block:: none
 
-  passdb {
+  passdb db1 {
     driver = imap
     args = host=192.168.1.123
   }
diff --git a/source/configuration_manual/authentication/caching.rst b/source/configuration_manual/authentication/caching.rst
@@ -82,7 +82,7 @@ use:
 
 ::
 
-   passdb {
+   passdb db1 {
      driver = pam
      args = cache_key=%s%u *
    }

diff --git a/source/configuration_manual/authentication/dict.rst b/source/configuration_manual/authentication/dict.rst
@@ -19,11 +19,11 @@ Auth configuration
 
 .. code-block:: none
 
-  passdb {
+  passdb db1 {
     driver = dict
     args = /etc/dovecot/dovecot-dict-auth.conf
   }
-  userdb {
+  userdb db1 {
     driver = dict
     args = /etc/dovecot/dovecot-dict-auth.conf
   }
@@ -221,12 +221,12 @@ Auth configuration
     auth = cdb:/etc/dovecot/auth.cdb
   }
 
-  passdb {
+  passdb db1 {
     driver = dict
     args = /etc/dovecot/dovecot-cdb.conf
   }
 
-  userdb {
+  userdb db1 {
     driver = dict
     args = /etc/dovecot/dovecot-cdb.conf
   }
@@ -275,15 +275,15 @@ Auth configuration
 
 .. code-block:: none
 
-  passdb {
+  passdb db1 {
     driver = dict
     args = /etc/dovecot/dovecot-dict-auth.conf
   }
-  userdb {
+  userdb db1 {
     # optional
     driver = prefetch
   }
-  userdb {
+  userdb db2 {
     driver = dict
     args = /etc/dovecot/dovecot-dict-auth.conf
   }

diff --git a/source/configuration_manual/authentication/domain_lost.rst b/source/configuration_manual/authentication/domain_lost.rst
@@ -74,27 +74,27 @@ user lookup.
 ::
 
    ## Your virtual passdb
-   passdb {
+   passdb db1 {
       driver = ldap
       args = /path/to/ldap/config
    }
 
-   passdb {
+   passdb db2 {
       driver = static
       args = user=%Ld noauthenticate
       skip = authenticated
    }
 
-   passdb {
+   passdb db3 {
       driver = pam
       skip = authenticated
    }
 
-   userdb {
+   userdb db1 {
       driver = ldap
       args = /path/to/ldap/config
    }
 
-   userdb {
+   userdb db2 {
       driver = passwd
    }
diff --git a/source/configuration_manual/authentication/kerberos.rst b/source/configuration_manual/authentication/kerberos.rst
@@ -87,7 +87,7 @@ If you only want to use Kerberos ticket-based authentication:
    auth_mechanisms = gssapi
    auth_krb5_keytab = /etc/dovecot/dovecot.keytab
 
-   userdb {
+   userdb db1 {
      driver = static
      args = uid=vmail gid=vmail home=/var/vmail/%u
    }
@@ -104,10 +104,10 @@ ticket-based authentication, you will need something like:
    auth_gssapi_hostname = "$ALL"
    auth_mechanisms = gssapi
    auth_krb5_keytab = /etc/dovecot/dovecot.keytab
-   passdb {
+   passdb db1 {
      driver = pam
    }
-   userdb {
+   userdb db1 {
      driver = passwd
    }
 
@@ -131,7 +131,7 @@ Then enable PAM passdb:
 
 ::
 
-   passdb {
+   passdb db1 {
      driver = pam
    }
 

diff --git a/source/configuration_manual/authentication/ldap.rst b/source/configuration_manual/authentication/ldap.rst
@@ -84,7 +84,7 @@ LDAP Backend Configuration
 
 .. code-block:: none
 
-  passdb {
+  passdb db1 {
     args = /etc/dovecot/dovecot-ldap.conf.ext
     driver = ldap
   }
@@ -256,12 +256,12 @@ dovecot.conf:
 
 .. code-block:: none
 
-   userdb {
+   userdb db1 {
      driver = ldap
      args = /etc/dovecot/dovecot-users-ldap.conf.ext
      result_success = continue-ok
    }
-   userdb {
+   userdb db2 {
      driver = ldap
      args = /etc/dovecot/dovecot-class-ldap.conf.ext
      skip = notfound

diff --git a/source/configuration_manual/authentication/ldap_authentication.rst b/source/configuration_manual/authentication/ldap_authentication.rst
@@ -8,14 +8,14 @@ See :ref:`LDAP <authentication-ldap>` for more details.
 
 .. code-block:: none
 
-  passdb {
+  passdb db1 {
     args = /etc/dovecot/dovecot-ldap.conf.ext
     driver = ldap
   }
-  userdb {
+  userdb db1 {
     driver = prefetch
   }
-  userdb {
+  userdb db2 {
     args = /etc/dovecot/dovecot-ldap.conf.ext
     driver = ldap
   }

diff --git a/source/configuration_manual/authentication/ldap_bind.rst b/source/configuration_manual/authentication/ldap_bind.rst
@@ -76,11 +76,11 @@ symlink to the first one. For example:
 
 ::
 
-   passdb {
+   passdb db1 {
      driver = ldap
      args = /etc/dovecot/dovecot-ldap.conf.ext
    }
-   userdb {
+   userdb db1 {
      driver = ldap
      args = /etc/dovecot/dovecot-ldap-userdb.conf.ext
    }

diff --git a/source/configuration_manual/authentication/ldap_userdb.rst b/source/configuration_manual/authentication/ldap_userdb.rst
@@ -135,12 +135,12 @@ dovecot.conf:
 
 ::
 
-   userdb {
+   userdb db1 {
      driver = ldap
      args = /etc/dovecot/dovecot-users-ldap.conf.ext
      result_success = continue-ok
    }
-   userdb {
+   userdb db2 {
      driver = ldap
      args = /etc/dovecot/dovecot-class-ldap.conf.ext
      skip = notfound

diff --git a/source/configuration_manual/authentication/lua_based_authentication.rst b/source/configuration_manual/authentication/lua_based_authentication.rst
@@ -59,7 +59,7 @@ Example
 
 .. code:: none
 
-  passdb {
+  passdb db1 {
     driver = lua
     args = file=/etc/dovecot/auth.lua password={PLAIN}test
   }
@@ -184,7 +184,7 @@ To configure passdb in dovecot, use
 
 .. code-block:: none
 
-  passdb {
+  passdb db1 {
     driver = lua
     args = file=/path/to/lua blocking=yes # default is yes
   }
@@ -218,7 +218,7 @@ To configure userdb in dovecot, use
 
 .. code-block:: none
 
-  userdb {
+  userdb db1 {
     driver = lua
     args = file=/path/to/lua blocking=yes # default is yes
   }

diff --git a/source/configuration_manual/authentication/master_users.rst b/source/configuration_manual/authentication/master_users.rst
@@ -72,13 +72,13 @@ Example configuration:
 .. code-block:: none
 
   auth_master_user_separator = *
-  passdb {
+  passdb db1 {
     driver = passwd-file
     args = /etc/dovecot/passwd.masterusers
     master = yes
     result_success = continue
   }
-  userdb {
+  userdb db1 {
     driver = passwd
   }
 
@@ -112,17 +112,17 @@ well:
 .. code-block:: none
 
   auth_master_user_separator = *
-  passdb {
+  passdb db1 {
     driver = sql
     args = /etc/dovecot/dovecot-sql-master.conf.ext
     master = yes
     result_success = continue
   }
-  passdb {
+  passdb db2 {
     driver = sql
     args = /etc/dovecot/dovecot-sql.conf.ext
   }
-  userdb {
+  userdb db1 {
     driver = sql
     args = /etc/dovecot/dovecot-sql.conf.ext
   }
@@ -155,13 +155,13 @@ exists and get other extra fields.
 .. code-block:: none
 
    # master password passdb
-   passdb {
+   passdb db1 {
       driver = static
       args = password=master-password
       result_success = continue
    }
    # primary passdb
-   passdb {
+   passdb db2 {
       driver = pam
    }
 
@@ -201,27 +201,27 @@ The dovecot.conf file for all 3 master user configurations will be as follows:
 
 .. code-block:: none
 
-  passdb {
+  passdb db1 {
     driver = sql
     args = /etc/dovecot/ownership-sql.conf
     master = yes
     result_success = continue
   }
 
-  passdb {
+  passdb db2 {
     driver = sql
     args = /etc/dovecot/domain-owner-sql.conf
     master = yes
     result_success = continue
   }
 
-  passdb {
+  passdb db3 {
     driver = sql
     args = /etc/dovecot/masteradmin-sql.conf
     master = yes
     result_success = continue
   }
-  passdb {
+  passdb db4 {
     args = /etc/dovecot/sql.conf
     driver = sql
   }

diff --git a/source/configuration_manual/authentication/multiple_authentication_databases.rst b/source/configuration_manual/authentication/multiple_authentication_databases.rst
@@ -43,22 +43,22 @@ dovecot.conf:
   mail_path = ~/Maildir
 
   # try to authenticate using SQL database first
-  passdb {
+  passdb db1 {
     driver = sql
     args = /etc/dovecot/dovecot-sql.conf.ext
   }
   # fallback to PAM
-  passdb {
+  passdb db2 {
     driver = pam
   }
 
   # look up users from SQL first (even if authentication was done using PAM!)
-  userdb {
+  userdb db1 {
     driver = sql
     args = /etc/dovecot/dovecot-sql.conf.ext
   }
   # if not found, fallback to /etc/passwd
-  userdb {
+  userdb db2 {
     driver = passwd
   }
 

diff --git a/source/configuration_manual/authentication/nss.rst b/source/configuration_manual/authentication/nss.rst
@@ -33,7 +33,7 @@ Example
 
 .. code-block:: none
 
-  userdb {
+  userdb db1 {
     driver = nss
     args = service=ldap
   }