Skip to content

Commit

Permalink
provider/fastly: Documentation updates
Browse files Browse the repository at this point in the history
  • Loading branch information
catsby committed Mar 24, 2016
1 parent 2ad37bb commit 3dcbdf0
Show file tree
Hide file tree
Showing 2 changed files with 16 additions and 9 deletions.
13 changes: 10 additions & 3 deletions website/source/docs/providers/fastly/index.html.markdown
Original file line number Diff line number Diff line change
Expand Up @@ -44,25 +44,32 @@ explained below:
### Static API Key ###

Static credentials can be provided by adding a `api_key` in-line in the
fastly provider block:
Fastly provider block:

Usage:

```
provider "fastly" {
api_key = "test"
}
resource "fastly_service_v1" "myservice" {
...
}
```

The API key for an account can be found on the Account page: https://app.fastly.com/#account

###Environment variables

You can provide your API key via `FASTLY_API_KEY` environment variable,
representing your Fastly API key.
representing your Fastly API key. When using this method, you may omit the
Fastly `provider` block entirely:

```
provider "fastly" {}
resource "fastly_service_v1" "myservice" {
...
}
```

Usage:
Expand Down
12 changes: 6 additions & 6 deletions website/source/docs/providers/fastly/r/service_v1.html.markdown
Original file line number Diff line number Diff line change
Expand Up @@ -8,12 +8,12 @@ description: |-

# fastly\_service\_v1

Provides an Fastly Service, representing the configuration for a website, app,
Provides a Fastly Service, representing the configuration for a website, app,
api, or anything else to be served through Fastly. A Service encompasses Domains
and Backends.

The Service resource requires a domain name that is correctly setup to direct
traffic to the Fastly service. See Fastly's guide on [Adding CNAME Records][2]
The Service resource requires a domain name that is correctly set up to direct
traffic to the Fastly service. See Fastly's guide on [Adding CNAME Records][fastly-cname]
on their documentation site for guidance.

## Example Usage
Expand Down Expand Up @@ -76,7 +76,7 @@ resource "aws_s3_bucket" "website" {
**Note:** For an AWS S3 Bucket, the Backend address is
`<domain>.s3-website-<region>.amazonaws.com`. The `default_host` attribute
should be set to `<bucket_name>.s3-website-<region>.amazonaws.com`. See the
Fastly documentation on [Amazon S3][1]
Fastly documentation on [Amazon S3][fastly-s3]

## Argument Reference

Expand Down Expand Up @@ -131,6 +131,6 @@ The following attributes are exported:
* `force_destroy` - Force the destruction of the Service on delete


[1]: https://docs.fastly.com/guides/integrations/amazon-s3
[2]: https://docs.fastly.com/guides/basic-setup/adding-cname-records
[fastly-s3]: https://docs.fastly.com/guides/integrations/amazon-s3
[fastly-cname]: https://docs.fastly.com/guides/basic-setup/adding-cname-records

0 comments on commit 3dcbdf0

Please sign in to comment.