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

Merge pull request #8637 from jrm16020/jeremy_tls_provider_docs_update 

Adding reference to docs for supported ECDSA curves.
This commit is contained in:
Paul Stack 2016-09-03 23:11:57 +03:00 committed by GitHub
parent 7e89c1d3a2 b295192ed3
commit 7485061635
1 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -72,7 +72,7 @@ The following arguments are supported:
* `name` - (Optional) The name of the ELB. By default generated by terraform.
* `access_logs` - (Optional) An Access Logs block. Access Logs documented below.
* `availability_zones` - (Required for an EC2-classic ELB) The AZ's to serve traffic in.
* `security_groups` - (Optional) A list of security group IDs to assign to the ELB.
* `security_groups` - (Optional) A list of security group IDs to assign to the ELB.
Only valid if creating an ELB within a VPC
* `subnets` - (Required for a VPC ELB) A list of subnet IDs to attach to the ELB.
* `instances` - (Optional) A list of instance ids to place in the ELB pool.
@ -82,7 +82,7 @@ The following arguments are supported:
* `cross_zone_load_balancing` - (Optional) Enable cross-zone load balancing. Default: `true`
* `idle_timeout` - (Optional) The time in seconds that the connection is allowed to be idle. Default: 60.
* `connection_draining` - (Optional) Boolean to enable connection draining.
* `connection_draining_timeout` - (Optional) The time in seconds to allow for connections to drain.
* `connection_draining_timeout` - (Optional) The time in seconds to allow for connections to drain.
* `tags` - (Optional) A mapping of tags to assign to the resource.
Exactly one of `availability_zones` or `subnets` must be specified: this
@ -104,7 +104,7 @@ Listeners (`listener`) support the following:
* `lb_protocol` - (Required) The protocol to listen on. Valid values are `HTTP`,
`HTTPS`, `TCP`, or `SSL`
* `ssl_certificate_id` - (Optional) The ARN of an SSL certificate you have
uploaded to AWS IAM. **Only valid when `lb_protocol` is either HTTPS or SSL**
uploaded to AWS IAM. **Note ECDSA-specific restrictions below. Only valid when `lb_protocol` is either HTTPS or SSL**
Health Check (`health_check`) supports the following:
@ -117,6 +117,14 @@ Health Check (`health_check`) supports the following:
* `interval` - (Required) The interval between checks.
* `timeout` - (Required) The length of time before the check times out.
## Note on ECDSA Key Algorithm
If the ARN of the `ssl_certificate_id` that is pointed to references a
certificate that was signed by an ECDSA key, note that ELB only supports the
P256 and P384 curves. Using a certificate signed by a key using a different
curve could produce the error `ERR_SSL_VERSION_OR_CIPHER_MISMATCH` in your
browser.
## Attributes Reference
The following attributes are exported:
@ -135,7 +143,7 @@ The following attributes are exported:
## Import
ELBs can be imported using the `name`, e.g.
ELBs can be imported using the `name`, e.g.
```
$ terraform import aws_elb.bar elb-production-12345