Prechádzať zdrojové kódy

Add docs for %(host_node_name)s in include=. Refs #737

Mike Naberezny 9 rokov pred
rodič
commit
3e541a34a4
2 zmenil súbory, kde vykonal 9 pridanie a 2 odobranie
  1. 3 0
      CHANGES.txt
  2. 6 2
      docs/configuration.rst

+ 3 - 0
CHANGES.txt

@@ -38,6 +38,9 @@
   number of tickets as a source of confusion and upgrade difficulties, so the
   path has been added.  Patch by Kelvin Wong.
 
+- Glob patterns in the ``include`` section now support the ``host_node_name``
+  expansion.  Patch by Paul Lockaby.
+
 - Files included via the ``[include]`` section are now logged at the ``INFO``
   level instead of ``WARN``.  Patch by Daniel Hahler.
 

+ 6 - 2
docs/configuration.rst

@@ -1119,8 +1119,10 @@ configuration.
   includes it.  A "glob" is a file pattern which matches a specified
   pattern according to the rules used by the Unix shell. No tilde
   expansion is done, but ``*``, ``?``, and character ranges expressed
-  with ``[]`` will be correctly matched.  Recursive includes from
-  included files are not supported.
+  with ``[]`` will be correctly matched.  The string expression is
+  evaluated against a dictionary that includes ``host_node_name``
+  and ``here`` (the directory of the supervisord config file).  Recursive
+  includes from included files are not supported.
 
   *Default*: No default (required)
 
@@ -1128,6 +1130,8 @@ configuration.
 
   *Introduced*: 3.0
 
+  *Changed*: 3.3.0.  Added support for the ``host_node_name`` expansion.
+
 ``[include]`` Section Example
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~