Skip to content

Commit 1f23f38

Browse files
committed
Terraform 0.8.x compatibility updates
1 parent 2163642 commit 1f23f38

File tree

3 files changed

+6
-6
lines changed

3 files changed

+6
-6
lines changed

generate-certs/main.tf

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -36,8 +36,8 @@ resource "aws_iam_role_policy" "s3_certs_rw" {
3636
"s3:PutObject"
3737
],
3838
"Resource": [
39-
"arn:aws:s3:::${replace(var.s3_bucket,"/(\/)+$/","")}",
40-
"arn:aws:s3:::${replace(var.s3_bucket,"/(\/)+$/","")}/*"
39+
"arn:aws:s3:::${replace(var.s3_bucket,"/(/)+$/","")}",
40+
"arn:aws:s3:::${replace(var.s3_bucket,"/(/)+$/","")}/*"
4141
]
4242
},
4343
{
@@ -46,7 +46,7 @@ resource "aws_iam_role_policy" "s3_certs_rw" {
4646
"s3:List*"
4747
],
4848
"Resource": [
49-
"arn:aws:s3:::${replace(var.s3_bucket,"/(\/)+$/","")}"
49+
"arn:aws:s3:::${replace(var.s3_bucket,"/(/)+$/","")}"
5050
]
5151
}
5252
]

generate-certs/templates/user_data.tpl

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,9 @@ manage_etc_hosts: True
33

44
runcmd:
55
- echo "S3_REGION=\"${region}\"" > /etc/default/openvpn-cert-generator
6-
- echo "S3_CERT_ROOT_PATH=\"s3://${replace(s3_bucket,"/(\/)+$/","")}/\"" >> /etc/default/openvpn-cert-generator
6+
- echo "S3_CERT_ROOT_PATH=\"s3://${replace(s3_bucket,"/(/)+$/","")}/\"" >> /etc/default/openvpn-cert-generator
77
- echo "KEY_SIZE=${cert_key_size}" >> /etc/default/openvpn-cert-generator
8-
- echo "S3_DIR_OVERRIDE=\"${replace(s3_dir_override,"/^(\/)+|(\/)+$/","")}\"" >> /etc/default/openvpn-cert-generator
8+
- echo "S3_DIR_OVERRIDE=\"${replace(s3_dir_override,"/^(/)+|(/)+$/","")}\"" >> /etc/default/openvpn-cert-generator
99
- echo "KEY_CITY=\"${key_city}\"" >> /etc/default/openvpn-cert-generator
1010
- echo "KEY_ORG=\"${key_org}\"" >> /etc/default/openvpn-cert-generator
1111
- echo "KEY_EMAIL=\"${key_email}\"" >> /etc/default/openvpn-cert-generator

generate-certs/variables.tf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ variable "region" {
5151
}
5252

5353
variable "subnet" {
54-
tpye = "string"
54+
type = "string"
5555
description = "VPC subnet to associate with the instance"
5656
}
5757

0 commit comments

Comments
 (0)