From e75d4f64bd4834e9b9e896abc46ba78a899d81c1 Mon Sep 17 00:00:00 2001 From: Tim Schindler Date: Thu, 30 Jun 2016 18:46:40 +0000 Subject: [PATCH] added documentation about ETCD_ADDR env var to etcd backend documentation --- website/source/docs/commands/environment.html.md | 2 +- website/source/docs/config/index.html.md | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/website/source/docs/commands/environment.html.md b/website/source/docs/commands/environment.html.md index 928d2d9ee5..bbc9f48eba 100644 --- a/website/source/docs/commands/environment.html.md +++ b/website/source/docs/commands/environment.html.md @@ -9,7 +9,7 @@ description: |- # Environment variables The Vault CLI will read the following environment variables to set -behavioral defaults. These can be overridden in all cases using +behavioral defaults. These can be overridden in all cases using command-line arguments; see the command-line help for details. The following table describes them: diff --git a/website/source/docs/config/index.html.md b/website/source/docs/config/index.html.md index ad43fc0f50..0e576675f1 100644 --- a/website/source/docs/config/index.html.md +++ b/website/source/docs/config/index.html.md @@ -331,7 +331,8 @@ For etcd, the following options are supported: * `address` (optional) - The address(es) of the etcd instance(s) to talk to. Can be comma separated list (protocol://host:port) of many etcd instances. - Defaults to "http://localhost:2379" if not specified. + Defaults to "http://localhost:2379" if not specified. May also be specified + via the ETCD_ADDR environment variable. * `sync` (optional) - Should we synchronize the list of available etcd servers on startup? This is a **string** value to allow for auto-sync to @@ -473,7 +474,7 @@ profile enabled. Vault will handle renewing profile credentials as they rotate. * `max_parallel` (optional) - The maximum number of concurrent connections to Azure. Defaults to "128". -The current implementation is limited to a maximum of 4 MBytes per blob/file. +The current implementation is limited to a maximum of 4 MBytes per blob/file. #### Backend Reference: Swift (Community-Supported)