github-personal/firezone
1
0
Fork 0
mirror of https://github.com/outbackdingo/firezone.git synced 2026-01-27 10:18:54 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix(devops): Fix typo in AWS bastion host TF (#3380)

Browse Source 
* Small typo in AWS bastion host was preventing unattended upgrades.
* Update all AWS modules to recreate the EC2 instance if the `user_data`
is ever changed.
This commit is contained in:
Brian Manifold
2024-01-24 13:03:26 -05:00
committed by GitHub
parent e3994a60e6
commit 305e571d04
6 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
terraform/modules/aws/bastion/main.tf
View File

@@ -5,6 +5,7 @@ resource "aws_instance" "this" {
subnet_id = var.subnet_id
vpc_security_group_ids = var.vpc_security_group_ids
associate_public_ip_address = var.associate_public_ip_address
user_data_replace_on_change = true
key_name = var.key_name
user_data = file("${path.module}/scripts/setup.sh")

2
terraform/modules/aws/bastion/scripts/setup.sh
View File

@@ -30,5 +30,5 @@ sudo cp $UPGRADE_CONF_FILE /tmp/unattended-upgrades.conf
sudo sed -i 's/\/\/\(\s*"\${distro_id}:\${distro_codename}-updates";\)/ \1/' "${UPGRADE_CONF_FILE}"
sudo sed -i 's/\/\/\(Unattended-Upgrade::Remove-Unused-Kernel-Packages "true";\)/\1/' "${UPGRADE_CONF_FILE}"
sudo sed -i 's/\/\/\(Unattended-Upgrade::Automatic-Reboot \)"false";/\1 "true";/' "${UPGRADE_CONF_FILE}"
sudo sed -i 's/\/\/\(Unattended-Upgrade::Automatic-Reboot-Time \)"02:00";/\1 "07:00;"/' "${UPGRADE_CONF_FILE}"
sudo sed -i 's/\/\/\(Unattended-Upgrade::Automatic-Reboot-Time \)"02:00";/\1 "07:00";/' "${UPGRADE_CONF_FILE}"
sudo sed -i 's/\/\/\(Unattended-Upgrade::Automatic-Reboot-WithUsers "true";\)/\1/' "${UPGRADE_CONF_FILE}"

1
terraform/modules/aws/coredns/main.tf
View File

@@ -7,6 +7,7 @@ resource "aws_instance" "this" {
associate_public_ip_address = var.associate_public_ip_address
private_ip = var.private_ip
key_name = var.key_name
user_data_replace_on_change = true
user_data = templatefile("${path.module}/templates/cloud-init.yaml", {
container_name = "coredns"

1
terraform/modules/aws/httpbin/main.tf
View File

@@ -6,6 +6,7 @@ resource "aws_instance" "this" {
vpc_security_group_ids = var.vpc_security_group_ids
associate_public_ip_address = var.associate_public_ip_address
private_ip = var.private_ip
user_data_replace_on_change = true
key_name = var.key_name
user_data = file("${path.module}/scripts/setup.sh")

1
terraform/modules/aws/iperf/main.tf
View File

@@ -6,6 +6,7 @@ resource "aws_instance" "this" {
vpc_security_group_ids = var.vpc_security_group_ids
associate_public_ip_address = var.associate_public_ip_address
private_ip = var.private_ip
user_data_replace_on_change = true
key_name = var.key_name
user_data = file("${path.module}/scripts/setup.sh")

1
terraform/modules/aws/nat/main.tf
View File

@@ -6,6 +6,7 @@ resource "aws_instance" "this" {
vpc_security_group_ids = var.vpc_security_group_ids
associate_public_ip_address = var.associate_public_ip_address
source_dest_check = false
user_data_replace_on_change = true
key_name = var.key_name
user_data = file("${path.module}/scripts/setup.sh")