ResiLien
/
terraform
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #1647 from TimeIncOSS/update-docs 

Update docs for Route53 + S3 bucket
This commit is contained in:
Paul Hinze 2015-04-23 07:41:59 -05:00
parent 10b73f95ae 17baf0bb2f
commit ca8e405273
3 changed files with 18 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
website/source/docs/providers/aws/r/route53_record.html.markdown
View File

@ -26,6 +26,7 @@ resource "aws_route53_record" "www" {
### Weighted routing policy ### Weighted routing policy
See [AWS Route53 Developer Guide](http://docs.aws.amazon.com/Route53/latest/DeveloperGuide/routing-policy.html#routing-policy-weighted) for details. See [AWS Route53 Developer Guide](http://docs.aws.amazon.com/Route53/latest/DeveloperGuide/routing-policy.html#routing-policy-weighted) for details.
``` ```
resource "aws_route53_record" "www-dev" { resource "aws_route53_record" "www-dev" {
zone_id = "${aws_route53_zone.primary.zone_id}" zone_id = "${aws_route53_zone.primary.zone_id}"

16
website/source/docs/providers/aws/r/route53_zone.html.markdown
View File

@ -29,6 +29,10 @@ resource "aws_route53_zone" "main" {
resource "aws_route53_zone" "dev" { resource "aws_route53_zone" "dev" {
name = "dev.example.com" name = "dev.example.com"
tags {
Environment = "dev"
}
} }
resource "aws_route53_record" "dev-ns" { resource "aws_route53_record" "dev-ns" {
@ -37,10 +41,10 @@ resource "aws_route53_record" "dev-ns" {
type = "NS" type = "NS"
ttl = "30" ttl = "30"
records = [ records = [
"${aws_route53_zone.dev.delegation_set_name_servers.0}", "${aws_route53_zone.dev.name_servers.0}",
"${aws_route53_zone.dev.delegation_set_name_servers.1}", "${aws_route53_zone.dev.name_servers.1}",
"${aws_route53_zone.dev.delegation_set_name_servers.2}", "${aws_route53_zone.dev.name_servers.2}",
"${aws_route53_zone.dev.delegation_set_name_servers.3}" "${aws_route53_zone.dev.name_servers.3}"
] ]
} }
``` ```
@ -50,10 +54,12 @@ resource "aws_route53_record" "dev-ns" {
The following arguments are supported: The following arguments are supported:
* `name` - (Required) This is the name of the hosted zone. * `name` - (Required) This is the name of the hosted zone.
* `tags` - (Optional) A mapping of tags to assign to the zone.
## Attributes Reference ## Attributes Reference
The following attributes are exported: The following attributes are exported:
* `zone_id` - The Hosted Zone ID. This can be referenced by zone records. * `zone_id` - The Hosted Zone ID. This can be referenced by zone records.
* `name_servers` - A list of name servers in a default delegation set.
Find more about delegation sets in [AWS docs](http://docs.aws.amazon.com/Route53/latest/APIReference/actions-on-reusable-delegation-sets.html).

6
website/source/docs/providers/aws/r/s3_bucket.html.markdown
View File

@ -16,6 +16,11 @@ Provides a S3 bucket resource.
resource "aws_s3_bucket" "b" { resource "aws_s3_bucket" "b" {
bucket = "my_tf_test_bucket" bucket = "my_tf_test_bucket"
acl = "private" acl = "private"
tags {
Name = "My bucket"
Environment = "Dev"
}
} }
``` ```
@ -25,6 +30,7 @@ The following arguments are supported:
* `bucket` - (Required) The name of the bucket. * `bucket` - (Required) The name of the bucket.
* `acl` - (Optional) The canned ACL to apply. Defaults to "private". * `acl` - (Optional) The canned ACL to apply. Defaults to "private".
* `tags` - (Optional) A mapping of tags to assign to the bucket.
## Attributes Reference ## Attributes Reference