Skip to content

Commit ab31204

Browse files
committed
Update certs module for 0.8.x compatibility
1 parent 1f23f38 commit ab31204

File tree

2 files changed

+4
-4
lines changed

2 files changed

+4
-4
lines changed

certs/main.tf

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -35,8 +35,8 @@ resource "aws_iam_role_policy" "s3_certs_ro" {
3535
"s3:Get*"
3636
],
3737
"Resource": [
38-
"arn:aws:s3:::${replace(var.s3_bucket,"/(\/)+$/","")}/${replace(var.s3_bucket_prefix,"/^(\/)+|(\/)+$/","")}",
39-
"arn:aws:s3:::${replace(var.s3_bucket,"/(\/)+$/","")}/${replace(var.s3_bucket_prefix,"/^(\/)+|(\/)+$/","")}/*"
38+
"arn:aws:s3:::${replace(var.s3_bucket,"/(/)+$/","")}/${replace(var.s3_bucket_prefix,"/^(/)+|(/)+$/","")}",
39+
"arn:aws:s3:::${replace(var.s3_bucket,"/(/)+$/","")}/${replace(var.s3_bucket_prefix,"/^(/)+|(/)+$/","")}/*"
4040
]
4141
},
4242
{
@@ -45,7 +45,7 @@ resource "aws_iam_role_policy" "s3_certs_ro" {
4545
"s3:List*"
4646
],
4747
"Resource": [
48-
"arn:aws:s3:::${replace(var.s3_bucket,"/(\/)+$/","")}"
48+
"arn:aws:s3:::${replace(var.s3_bucket,"/(/)+$/","")}"
4949
]
5050
}
5151
]

certs/templates/user_data.tpl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#cloud-config
22
runcmd:
3-
- echo "OPENVPN_CERT_SOURCE=s3://${replace(s3_bucket,"/(\/)+$/","")}/${replace(s3_bucket_prefix,"/^(\/)+|(\/)+$/","")}" > /etc/openvpn/get-openvpn-certs.env
3+
- echo "OPENVPN_CERT_SOURCE=s3://${replace(s3_bucket,"/(/)+$/","")}/${replace(s3_bucket_prefix,"/^(/)+|(/)+$/","")}" > /etc/openvpn/get-openvpn-certs.env
44
- echo "push \"route $(ip route get 8.8.8.8| grep src| sed 's/.*src \(.*\)$/\1/g') 255.255.255.255 net_gateway\"" >> /etc/openvpn/server.conf
55
- echo "push \"route ${cidrhost(element(split(",",route_cidrs),1), 0)} ${cidrnetmask(element(split(",",route_cidrs),1))}\"" >> /etc/openvpn/server.conf
66
- echo "push \"route ${cidrhost(element(split(",",route_cidrs),2), 0)} ${cidrnetmask(element(split(",",route_cidrs),2))}\"" >> /etc/openvpn/server.conf

0 commit comments

Comments
 (0)