From c1555987d77b19078a6a60e1f5fe5007a31b22c8 Mon Sep 17 00:00:00 2001 From: Matt Martz Date: Tue, 16 Sep 2014 10:22:32 -0500 Subject: [PATCH 1/2] Document vault_password_file in intro_configuration --- docsite/rst/intro_configuration.rst | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/docsite/rst/intro_configuration.rst b/docsite/rst/intro_configuration.rst index 016faf5e44c..5b126dccd92 100644 --- a/docsite/rst/intro_configuration.rst +++ b/docsite/rst/intro_configuration.rst @@ -548,6 +548,20 @@ different locations:: Most users will not need to use this feature. See :doc:`developing_plugins` for more details + +.. _vault_password_file: + +vault_password_file +=================== + +.. versionadded:: 1.7 + +Configures the path to the Vault password file as an alternative to specifying ``--vault-password-file`` on the command line:: + + vault_password_file = /path/to/vault_password_file + +As of 1.7 this file can also be a script. If you are using a script instead of a flat file, ensure that it is marked as executable, and that the password is printed to standard output. If your script needs to prompt for data, prompts can be sent to standard error. + .. _paramiko_settings: Paramiko Specific Settings From c319df78f87d92b1ba8a309d8318436a2454db08 Mon Sep 17 00:00:00 2001 From: Matt Martz Date: Tue, 16 Sep 2014 10:31:50 -0500 Subject: [PATCH 2/2] Also document force_color --- docsite/rst/intro_configuration.rst | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/docsite/rst/intro_configuration.rst b/docsite/rst/intro_configuration.rst index 5b126dccd92..eb57b2bf186 100644 --- a/docsite/rst/intro_configuration.rst +++ b/docsite/rst/intro_configuration.rst @@ -237,6 +237,15 @@ different locations:: Most users will not need to use this feature. See :doc:`developing_plugins` for more details +.. _force_color: + +force_color +=========== + +This options forces color mode even when running without a TTY:: + + force_color = 1 + .. _forks: forks