Skip to content

Commit

Permalink
Merge pull request #691 from hashicorp/sethvargo/tabs_spaces_oh_my
Browse files Browse the repository at this point in the history
Remove tabs from terminal output
  • Loading branch information
jefferai committed Oct 12, 2015
2 parents f056ad6 + cfd7aa5 commit 9549d9e
Show file tree
Hide file tree
Showing 20 changed files with 297 additions and 257 deletions.
14 changes: 9 additions & 5 deletions website/source/docs/auth/cert.html.md
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,8 @@ from an external source.

### Via the CLI
```
vault auth -method=cert \
-ca-cert=ca.pem -client-cert=cert.pem -client-key=key.pem
$ vault auth -method=cert \
-ca-cert=ca.pem -client-cert=cert.pem -client-key=key.pem
```

### Via the API
Expand All @@ -31,8 +31,8 @@ certificate and when the login endpoint is hit, the auth backend will determine
if there is a matching trusted certificate to authenticate the client.

```
curl --cacert ca.pem --cert cert.pem --key key.pem \
$VAULT_ADDR/v1/auth/cert/login -XPOST
$ curl --cacert ca.pem --cert cert.pem --key key.pem \
$VAULT_ADDR/v1/auth/cert/login -XPOST
```

## Configuration
Expand All @@ -57,7 +57,11 @@ trusted certificates that are allowed to authenticate. An example is shown below
Use `vault path-help` for more details.

```
$ vault write auth/cert/certs/web display_name=web policies=web,prod certificate=@web-cert.pem lease=3600
$ vault write auth/cert/certs/web \
display_name=web \
policies=web,prod \
certificate=@web-cert.pem \
lease=3600
...
```

Expand Down
2 changes: 1 addition & 1 deletion website/source/docs/auth/github.html.md
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ Prior to using the GitHub auth backend, it must be configured. To
configure it, use the `/config` endpoint with the following arguments:

* `organization` (string, required) - The organization name a user must
be a part of to authenticate.
be a part of to authenticate.

###Generate a GitHub Personal Access Token
Access your Personal Access Tokens in GitHub at [https://github.com/settings/tokens](https://github.com/settings/tokens).
Expand Down
36 changes: 18 additions & 18 deletions website/source/docs/auth/ldap.html.md
Original file line number Diff line number Diff line change
Expand Up @@ -46,20 +46,20 @@ The response will be in JSON. For example:

```javascript
{
"lease_id":"",
"renewable":false,
"lease_duration":0,
"data":null,
"auth":{
"client_token":"c4f280f6-fdb2-18eb-89d3-589e2e834cdb",
"policies":[
"lease_id": "",
"renewable": false,
"lease_duration": 0,
"data": null,
"auth": {
"client_token": "c4f280f6-fdb2-18eb-89d3-589e2e834cdb",
"policies": [
"root"
],
"metadata":{
"username":"mitchellh"
"metadata": {
"username": "mitchellh"
},
"lease_duration":0,
"renewable":false
"lease_duration": 0,
"renewable": false
}
}
```
Expand Down Expand Up @@ -87,13 +87,13 @@ Use `vault path-help` for more details.

```
$ vault write auth/ldap/config url="ldap://ldap.forumsys.com" \
userattr=uid \
userdn="dc=example,dc=com" \
groupdn="dc=example,dc=com" \
upndomain="forumsys.com" \
certificate=@ldap_ca_cert.pem \
insecure_tls=false \
starttls=true
userattr=uid \
userdn="dc=example,dc=com" \
groupdn="dc=example,dc=com" \
upndomain="forumsys.com" \
certificate=@ldap_ca_cert.pem \
insecure_tls=false \
starttls=true
...
```

Expand Down
2 changes: 1 addition & 1 deletion website/source/docs/auth/mfa.html.md
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ options to behave differently (see Duo configuration below).

### Duo

The Duo MFA type is configured through two paths: `duo/config` and `duo/access`.
The Duo MFA type is configured through two paths: `duo/config` and `duo/access`.

`duo/access` contains connection information for the Duo Auth API. To configure:

Expand Down
20 changes: 10 additions & 10 deletions website/source/docs/auth/token.html.md
Original file line number Diff line number Diff line change
Expand Up @@ -118,11 +118,11 @@ of the header should be "X-Vault-Token" and the value should be the token.
```javascript
{
"auth": {
"client_token": "ABCD",
"policies": ["web", "stage"],
"metadata": {"user": "armon"},
"lease_duration": 3600,
"renewable": true,
"client_token": "ABCD",
"policies": ["web", "stage"],
"metadata": {"user": "armon"},
"lease_duration": 3600,
"renewable": true,
}
}
```
Expand Down Expand Up @@ -346,11 +346,11 @@ of the header should be "X-Vault-Token" and the value should be the token.
```javascript
{
"auth": {
"client_token": "ABCD",
"policies": ["web", "stage"],
"metadata": {"user": "armon"},
"lease_duration": 3600,
"renewable": true,
"client_token": "ABCD",
"policies": ["web", "stage"],
"metadata": {"user": "armon"},
"lease_duration": 3600,
"renewable": true,
}
}
```
Expand Down
30 changes: 16 additions & 14 deletions website/source/docs/auth/userpass.html.md
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,8 @@ passwords from an external source.

```
$ vault auth -method=userpass \
username=foo \
password=bar
username=foo \
password=bar
```

#### Via the API
Expand All @@ -42,20 +42,20 @@ The response will be in JSON. For example:

```javascript
{
"lease_id":"",
"renewable":false,
"lease_duration":0,
"data":null,
"auth":{
"client_token":"c4f280f6-fdb2-18eb-89d3-589e2e834cdb",
"policies":[
"lease_id": "",
"renewable": false,
"lease_duration": 0,
"data": null,
"auth": {
"client_token": "c4f280f6-fdb2-18eb-89d3-589e2e834cdb",
"policies": [
"root"
],
"metadata":{
"username":"mitchellh"
"metadata": {
"username": "mitchellh"
},
"lease_duration":0,
"renewable":false
"lease_duration": 0,
"renewable": false
}
}
```
Expand Down Expand Up @@ -83,7 +83,9 @@ users that are allowed to authenticate. An example is shown below.
Use `vault path-help` for more details.

```
$ vault write auth/userpass/users/mitchellh password=foo policies=root
$ vault write auth/userpass/users/mitchellh \
password=foo \
policies=root
...
```

Expand Down
7 changes: 5 additions & 2 deletions website/source/docs/commands/read-write.html.md
Original file line number Diff line number Diff line change
Expand Up @@ -22,15 +22,18 @@ to discover the paths.
To write data to Vault, you use `vault write`. It is very easy to use:

```
$ vault write secret/password value=itsasecret
$ vault write secret/password \
value=itsasecret
...
```

The above writes a value to `secret/password`. As mentioned in the getting
started guide, multiple values can also be written:

```
$ vault write secret/password value=itsasecret username=something
$ vault write secret/password \
value=itsasecret \
username=something
...
```

Expand Down
20 changes: 10 additions & 10 deletions website/source/docs/http/index.html.md
Original file line number Diff line number Diff line change
Expand Up @@ -63,10 +63,10 @@ This maps to `secret/foo` where `foo` is the key in the `secret/` backend/
Here is an example of reading a secret using cURL:

```shell
curl \
-H "X-Vault-Token: f3b09679-3001-009d-2b80-9c306ab81aa6" \
-X GET \
http://127.0.0.1:8200/v1/secret/foo
$ curl \
-H "X-Vault-Token: f3b09679-3001-009d-2b80-9c306ab81aa6" \
-X GET \
http://127.0.0.1:8200/v1/secret/foo
```

To write a secret, issue a POST on the following URL:
Expand All @@ -86,12 +86,12 @@ with a JSON body like:
Here is an example of writing a secret using cURL:

```shell
curl \
-H "X-Vault-Token: f3b09679-3001-009d-2b80-9c306ab81aa6" \
-H "Content-Type: application/json" \
-X POST \
-d '{"value":"bar"}' \
http://127.0.0.1:8200/v1/secret/baz
$ curl \
-H "X-Vault-Token: f3b09679-3001-009d-2b80-9c306ab81aa6" \
-H "Content-Type: application/json" \
-X POST \
-d '{"value":"bar"}' \
http://127.0.0.1:8200/v1/secret/baz
```

For more examples, please look at the Vault API client.
Expand Down
14 changes: 7 additions & 7 deletions website/source/docs/http/sys-health.html.md
Original file line number Diff line number Diff line change
Expand Up @@ -33,13 +33,13 @@ description: |-
<dt>Returns</dt>
<dd>

```
{
"initialized": true,
"sealed": false,
"standby": false
}
```
```javascript
{
"initialized": true,
"sealed": false,
"standby": false
}
```

Status Codes:

Expand Down
56 changes: 28 additions & 28 deletions website/source/docs/secrets/aws/index.html.md
Original file line number Diff line number Diff line change
Expand Up @@ -116,27 +116,27 @@ The root credentials need permission to perform various IAM actions. These are t

```javascript
{
"Version": "2012-10-17",
"Statement": [
{
"Effect": "Allow",
"Action": [
"iam:CreateAccessKey",
"iam:CreateUser",
"iam:PutUserPolicy",
"iam:ListGroupsForUser",
"iam:ListUserPolicies",
"iam:ListAccessKeys",
"iam:DeleteAccessKey",
"iam:DeleteUserPolicy",
"iam:RemoveUserFromGroup",
"iam:DeleteUser"
],
"Resource": [
"arn:aws:iam::ACCOUNT-ID-WITHOUT-HYPHENS:user/vault-*"
]
}
]
"Version": "2012-10-17",
"Statement": [
{
"Effect": "Allow",
"Action": [
"iam:CreateAccessKey",
"iam:CreateUser",
"iam:PutUserPolicy",
"iam:ListGroupsForUser",
"iam:ListUserPolicies",
"iam:ListAccessKeys",
"iam:DeleteAccessKey",
"iam:DeleteUserPolicy",
"iam:RemoveUserFromGroup",
"iam:DeleteUser"
],
"Resource": [
"arn:aws:iam::ACCOUNT-ID-WITHOUT-HYPHENS:user/vault-*"
]
}
]
}
```

Expand Down Expand Up @@ -286,9 +286,9 @@ interactive help output.

```javascript
{
"data": {
"policy": "..."
}
"data": {
"policy": "..."
}
}
```

Expand Down Expand Up @@ -346,10 +346,10 @@ interactive help output.

```javascript
{
"data": {
"access_key": "...",
"secret_key": "..."
}
"data": {
"access_key": "...",
"secret_key": "..."
}
}
```

Expand Down
24 changes: 13 additions & 11 deletions website/source/docs/secrets/cassandra/index.html.md
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,9 @@ writing one or more hosts, a username, and a password:

```text
$ vault write cassandra/config/connection \
hosts=localhost username=cassandra password=cassandra
hosts=localhost \
username=cassandra \
password=cassandra
```

In this case, we've configured Vault with the user "cassandra" and password "cassandra",
Expand Down Expand Up @@ -258,12 +260,12 @@ subpath for interactive help output.

```javascript
{
"data": {
"creation_cql": "CREATE USER...",
"revocation_cql": "DROP USER...",
"lease": "12h",
"lease_grace_period": "1h"
}
"data": {
"creation_cql": "CREATE USER...",
"revocation_cql": "DROP USER...",
"lease": "12h",
"lease_grace_period": "1h"
}
}
```

Expand Down Expand Up @@ -321,10 +323,10 @@ subpath for interactive help output.

```javascript
{
"data": {
"username": "vault-root-1430158508-126",
"password": "132ae3ef-5a64-7499-351e-bfe59f3a2a21"
}
"data": {
"username": "vault-root-1430158508-126",
"password": "132ae3ef-5a64-7499-351e-bfe59f3a2a21"
}
}
```

Expand Down

0 comments on commit 9549d9e

Please sign in to comment.