Permalink
Browse files

Change Vault mount path cli option name

  • Loading branch information...
okushchenko committed May 4, 2018
1 parent 060d95a commit 7cac924c14e23f5feb299793de5d2a335c5841a6
Showing with 7 additions and 7 deletions.
  1. +1 −1 backends/client.go
  2. +1 −1 backends/config.go
  3. +1 −1 config.go
  4. +2 −2 docs/command-line-flags.md
  5. +1 −1 docs/configuration-guide.md
  6. +1 −1 integration/vault-path/test.sh
View
@@ -75,7 +75,7 @@ func New(config Config) (StoreClient, error) {
"cert": config.ClientCert,
"key": config.ClientKey,
"caCert": config.ClientCaKeys,
"path": config.VaultPath,
"path": config.Path,
}
return vault.New(backendNodes[0], config.AuthType, vaultConfig)
case "dynamodb":
View
@@ -24,6 +24,6 @@ type Config struct {
SecretID string `toml:"secret_id"`
YAMLFile util.Nodes `toml:"file"`
Filter string `toml:"filter"`
VaultPath string `toml:"vault_path"`
Path string `toml:"path"`
Role string
}
View
@@ -66,7 +66,7 @@ func init() {
flag.StringVar(&config.UserID, "user-id", "", "Vault user-id to use with the app-id backend (only used with -backend=value and auth-type=app-id)")
flag.StringVar(&config.RoleID, "role-id", "", "Vault role-id to use with the AppRole, Kubernetes backends (only used with -backend=vault and either auth-type=app-role or auth-type=kubernetes)")
flag.StringVar(&config.SecretID, "secret-id", "", "Vault secret-id to use with the AppRole backend (only used with -backend=vault and auth-type=app-role)")
flag.StringVar(&config.VaultPath, "vault-path", "", "Vault mount path of the auth method (only used with -backend=vault)")
flag.StringVar(&config.Path, "path", "", "Vault mount path of the auth method (only used with -backend=vault)")
flag.StringVar(&config.Table, "table", "", "the name of the DynamoDB table (only used with -backend=dynamodb)")
flag.StringVar(&config.Separator, "separator", "", "the separator to replace '/' with when looking up keys in the backend, prefixed '/' will also be removed (only used with -backend=redis)")
flag.StringVar(&config.Username, "username", "", "the username to authenticate as (only used with vault and etcd backends)")
@@ -46,6 +46,8 @@ Usage of confd:
run once and exit
-password string
the password to authenticate with (only used with vault and etcd backends)
-path string
Vault mount path of the auth method (only used with -backend=vault)
-prefix string
key path prefix
-role-id string
@@ -70,8 +72,6 @@ Usage of confd:
Vault user-id to use with the app-id backend (only used with -backend=value and auth-type=app-id)
-username string
the username to authenticate as (only used with vault and etcd backends)
-vault-path string
Vault mount path of the auth method (only used with -backend=vault)
-version
print version and exit
-watch
@@ -35,7 +35,7 @@ Optional:
* `secret_id` (string) - Vault secret-id to use with the AppRole backend (only used with -backend=vault and auth-type=app-role).
* `file` (array of strings) - The YAML file to watch for changes (only used with -backend=file).
* `filter` (string) - Files filter (only used with -backend=file) (default "*").
* `vault_path` (string) - Vault mount path of the auth method (only used with -backend=vault).
* `path` (string) - Vault mount path of the auth method (only used with -backend=vault).
Example:
@@ -37,5 +37,5 @@ confd --onetime --log-level debug \
--auth-type app-role \
--role-id $ROLE_ID \
--secret-id $SECRET_ID \
--vault-path=test \
--path=test \
--node http://127.0.0.1:8200

0 comments on commit 7cac924

Please sign in to comment.