global: Config $settings now have $SET: prefix

sirainen · Mar 18, 2024 · d20e5df · d20e5df
1 parent cdbaca0
commit d20e5df
Show file tree

Hide file tree

Showing 6 changed files with 13 additions and 13 deletions.
diff --git a/source/admin_manual/post_login_scripting.rst b/source/admin_manual/post_login_scripting.rst
@@ -21,7 +21,7 @@ use post-login service by editing ``conf.d/10-master.conf``:
     executable = script-login /usr/local/bin/postlogin.sh
 
     # the script process runs as the user specified here (v2.0.14+):
-    user = $default_internal_user
+    user = $SET:default_internal_user
     # this UNIX socket listener must use the same name as given to imap executable
     unix_listener imap-postlogin {
     }

diff --git a/source/admin_manual/system_users_used_by_dovecot.rst b/source/admin_manual/system_users_used_by_dovecot.rst
@@ -125,7 +125,7 @@ auth process or auth worker process. They have different default users:
 .. code-block:: none
 
   service auth {
-    user = $default_internal_user
+    user = $SET:default_internal_user
   }
   service auth-worker {
     user = root
@@ -143,6 +143,6 @@ Even this doesn't need root access if the file is readable by shadow group:
 .. code-block:: none
 
   service auth-worker {
-    user = $default_internal_user
+    user = $SET:default_internal_user
     group = shadow
   }
diff --git a/source/configuration_manual/config_file/index.rst b/source/configuration_manual/config_file/index.rst
@@ -339,18 +339,18 @@ The value is read exactly as the entire contents of the file. This includes all
 Variable expansion
 ^^^^^^^^^^^^^^^^^^
 
-It's possible to refer to other earlier settings as ``$name``.
+It's possible to refer to other earlier settings as ``$SET:name``.
 
 Example:
 
 .. code-block:: none
 
    key = value1
-   key2 = $key value2
+   key2 = $SET:key value2
    # Equivalent to key2 = value1 value2
 
 However, you must be careful with the ordering of these in the configuration
-file, because the ``$variables`` are expanded immediately while parsing the
+file, because the ``$SET:variables`` are expanded immediately while parsing the
 config file and they're not updated later.
 
 Environment variables

diff --git a/source/configuration_manual/hibernation.rst b/source/configuration_manual/hibernation.rst
@@ -29,18 +29,18 @@ Configuration
     # This may be insecure in some installations, which is why this isn't
     # done by default.
     unix_listener imap-master {
-      user = $default_internal_user
+      user = $SET:default_internal_user
     }
   }
 
   # The following is the default already in v2.3.1+:
   service imap {
-    extra_groups = $default_internal_group
+    extra_groups = $SET:default_internal_group
   }
   service imap-hibernate {
     unix_listener imap-hibernate {
       mode = 0660
-      group = $default_internal_group
+      group = $SET:default_internal_group
     }
   }
 

diff --git a/source/configuration_manual/howto/convert_password_schemes.rst b/source/configuration_manual/howto/convert_password_schemes.rst
@@ -113,7 +113,7 @@ Example
    }
    service pop3-postlogin {
      executable = script-login /usr/local/etc/popafter.sh
-     user = $default_internal_user
+     user = $SET:default_internal_user
      unix_listener pop3-postlogin {
      }
    }

diff --git a/source/configuration_manual/mail_location/obox/index.rst b/source/configuration_manual/mail_location/obox/index.rst
@@ -43,9 +43,9 @@ usage and number of used file descriptors.
 .. code-block:: none
 
    plugin {
-     obox_max_parallel_writes = $mail_prefetch_count
-     obox_max_parallel_copies = $mail_prefetch_count
-     obox_max_parallel_deletes = $mail_prefetch_count
+     obox_max_parallel_writes = $SET:mail_prefetch_count
+     obox_max_parallel_copies = $SET:mail_prefetch_count
+     obox_max_parallel_deletes = $SET:mail_prefetch_count
    }
 
 Override mail_prefetch_count setting for writes, copies, or deletes. They