From c888d0b98a9a289e43ebd5b292ceff92a75b1a3d Mon Sep 17 00:00:00 2001 From: Mike Naberezny Date: Mon, 11 Apr 2016 10:10:08 -0700 Subject: [PATCH] Add docs for %(host_node_name)s in include=. Refs #737 --- CHANGES.txt | 3 +++ docs/configuration.rst | 8 ++++++-- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/CHANGES.txt b/CHANGES.txt index 35d8c41bf..20045c55f 100644 --- a/CHANGES.txt +++ b/CHANGES.txt @@ -1,6 +1,9 @@ 3.3.0 (Next 3.x Release) ------------------------ +- 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. diff --git a/docs/configuration.rst b/docs/configuration.rst index a82ca2ccf..ac13e2647 100644 --- a/docs/configuration.rst +++ b/docs/configuration.rst @@ -1099,8 +1099,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) @@ -1108,6 +1110,8 @@ configuration. *Introduced*: 3.0 + *Changed*: 3.3.0. Added support for the ``host_node_name`` expansion. + ``[include]`` Section Example ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~