Skip to content

Update Terraform configuration for new OpenAustralia server #354

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
benrfairless merged 3 commits into from
Feb 3, 2026
Merged

Update Terraform configuration for new OpenAustralia server #354

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
73ac9fb
Update resource tags for new environment in Terraform configuration
benrfairless Jan 31, 2026
906aac3
Update new OpenAustralia server to use Ubuntu 22.04 AMI
benrfairless Jan 31, 2026
d8b6bcc
Update key name for production server to use 'terraform'
benrfairless Jan 31, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions terraform/main.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -94,6 +94,7 @@ module "openaustralia" {
security_group_service = aws_security_group.openaustralia
instance_profile = aws_iam_instance_profile.logging
ami = var.ubuntu_16_ami
ubuntu_22_ami = var.ubuntu_22_ami
ubuntu_24_ami = var.ubuntu_24_ami
cloudflare_account_id = var.cloudflare_account_id
}
Expand Down
11 changes: 6 additions & 5 deletions terraform/openaustralia/production.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,16 +1,17 @@
# New OpenAustralia Production Server on Ubuntu 24.04
# New OpenAustralia Production Server on Ubuntu 22.04
# This creates a parallel production environment for OpenAustralia

# After discussion with Brenda, this new server will house both staging and production.
# Note: Using Ubuntu 22.04 due to Ansible 2.10 compatibility issues with Ubuntu 24.04

resource "aws_instance" "production" {
ami = var.ubuntu_24_ami
ami = var.ubuntu_22_ami

instance_type = "t3.small"
ebs_optimized = true
key_name = "test"
key_name = "terraform"
tags = {
Name = "openaustralia"
Name = "openaustralia-prod"
}

# Increase root volume size to 20GB to allow for more packages and data
Expand Down Expand Up @@ -44,7 +45,7 @@ resource "aws_ebs_volume" "production_data" {
size = 20
type = "gp3"
tags = {
Name = "openaustralia_data"
Name = "openaustralia-prod-data"
}
}

Expand Down
1 change: 1 addition & 0 deletions terraform/openaustralia/variables.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,5 @@ variable "security_group_service" {}
variable "instance_profile" {}
variable "ami" {}
variable "cloudflare_account_id" {}
variable "ubuntu_22_ami" {}
variable "ubuntu_24_ami" {}
Loading