Add info about root_dir and the options to which it is prepended

This commit is contained in:
Erik Johnson 2014-02-04 15:46:22 -06:00
parent 6413573dc5
commit ffd189cc7b

View file

@ -154,12 +154,19 @@ Specify the location of the master pidfile
Default: :file:`/`
The system root directory to operate from, change this to make Salt run from
an alternative root
an alternative root.
.. code-block:: yaml
root_dir: /
.. note::
This directory is prepended to the following options:
:conf_master:`pki_dir`, :conf_master:`cachedir`, :conf_master:`sock_dir`,
:conf_master:`log_file`, :conf_master:`autosign_file`,
:conf_master:`autoreject_file`, :conf_master:`pidfile`.
.. conf_master:: pki_dir
``pki_dir``
@ -387,6 +394,8 @@ will be automatically accepted. Matches will be searched for first by string
comparison, then by globbing, then by full-string regex matching. This is
insecure!
.. conf_master:: autoreject_file
``autoreject_file``
-------------------