Skip to content

Add debian 13 support #99

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

Closed
syrull wants to merge 4 commits into from
Closed

Add debian 13 support #99

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
1f427c0
Add Debian 13 EC2 instance support
syrull Jan 8, 2026
f61b751
Comment out CIS Debian 13 configurations
syrull Jan 8, 2026
3cace04
Fix Debian 11 and 12 AMI filters
syrull Jan 9, 2026
a2bc358
Fix private AMI references to use the correct data source syntax
syrull Jan 12, 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
37 changes: 35 additions & 2 deletions aws/ec2-instances/amis.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -317,7 +317,7 @@ data "aws_ami" "debian11" {

filter {
name = "name"
values = ["debian-11-amd64-2023*"]
values = ["debian-11-amd64-*"]
}

filter {
Expand Down Expand Up @@ -349,7 +349,7 @@ data "aws_ami" "debian12" {

filter {
name = "name"
values = ["debian-12-amd64-2023*"]
values = ["debian-12-amd64-*"]
}

filter {
Expand All @@ -376,6 +376,39 @@ data "aws_ami" "debian12_cis" {
owners = ["679593333241"]
}

data "aws_ami" "debian13" {
most_recent = true

filter {
name = "name"
values = ["debian-13-amd64-*"]
}

filter {
name = "virtualization-type"
values = ["hvm"]
}

owners = ["136693071363"]
}

// CIS Debian 13 - uncomment when CIS image is available
// data "aws_ami" "debian13_cis" {
// most_recent = true
//
// filter {
// name = "name"
// values = ["CIS Debian Linux 13*"]
// }
//
// filter {
// name = "virtualization-type"
// values = ["hvm"]
// }
//
// owners = ["679593333241"]
// }

data "aws_ami" "suse15" {
most_recent = true

Expand Down
65 changes: 63 additions & 2 deletions aws/ec2-instances/main.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -333,7 +333,68 @@ module "debian12_cis_cnspec" {
user_data_replace_on_change = true
}

// Debian 13

module "debian13" {
source = "terraform-aws-modules/ec2-instance/aws"
version = "~> 5.7.1"

create = var.create_debian13
name = "${var.prefix}-debian13-${random_id.instance_id.id}"
ami = data.aws_ami.debian13.id
instance_type = var.linux_instance_type
vpc_security_group_ids = [module.linux_sg.security_group_id]
subnet_id = module.vpc.public_subnets[0]
key_name = var.aws_key_pair_name
associate_public_ip_address = true
}

module "debian13_cnspec" {
source = "terraform-aws-modules/ec2-instance/aws"
version = "~> 5.7.1"

create = var.create_debian13_cnspec
name = "${var.prefix}-debian13-${random_id.instance_id.id}"
ami = data.aws_ami.debian13.id
instance_type = var.linux_instance_type
vpc_security_group_ids = [module.linux_sg.security_group_id]
subnet_id = module.vpc.public_subnets[0]
key_name = var.aws_key_pair_name
associate_public_ip_address = true
user_data = base64encode(local.linux_user_data)
user_data_replace_on_change = true
}

// CIS Debian 13 - uncomment when CIS image is available
// module "debian13_cis" {
// source = "terraform-aws-modules/ec2-instance/aws"
// version = "~> 5.7.1"
//
// create = var.create_debian13_cis
// name = "${var.prefix}-debian13-cis-${random_id.instance_id.id}"
// ami = data.aws_ami.debian13_cis.id
// instance_type = var.linux_instance_type
// vpc_security_group_ids = [module.linux_sg.security_group_id]
// subnet_id = module.vpc.public_subnets[0]
// key_name = var.aws_key_pair_name
// associate_public_ip_address = true
// }

// module "debian13_cis_cnspec" {
// source = "terraform-aws-modules/ec2-instance/aws"
// version = "~> 5.7.1"
//
// create = var.create_debian13_cis_cnspec
// name = "${var.prefix}-debian13-cis-cnspec-${random_id.instance_id.id}"
// ami = data.aws_ami.debian13_cis.id
// instance_type = var.linux_instance_type
// vpc_security_group_ids = [module.linux_sg.security_group_id]
// subnet_id = module.vpc.public_subnets[0]
// key_name = var.aws_key_pair_name
// associate_public_ip_address = true
// user_data = base64encode(local.linux_user_data)
// user_data_replace_on_change = true
// }

// Oracle 7

Expand Down Expand Up @@ -1508,7 +1569,7 @@ module "private_ami" {

create = var.create_private_ami
name = "${var.prefix}-${var.private_ami_name}-${random_id.instance_id.id}"
ami = data.aws_ami.private_ami.id
ami = one(data.aws_ami.private_ami[*].id)
instance_type = var.private_ami_instance_type
vpc_security_group_ids = [module.linux_sg.security_group_id]
subnet_id = module.vpc.public_subnets[0]
Expand All @@ -1522,7 +1583,7 @@ module "private_ami_cnspec" {

create = var.create_private_ami_cnspec
name = "${var.prefix}-${var.private_ami_name}-cnspec-${random_id.instance_id.id}"
ami = data.aws_ami.private_ami.id
ami = one(data.aws_ami.private_ami[*].id)
instance_type = var.private_ami_instance_type
vpc_security_group_ids = [module.linux_sg.security_group_id]
subnet_id = module.vpc.public_subnets[0]
Expand Down
18 changes: 18 additions & 0 deletions aws/ec2-instances/outputs.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -176,6 +176,24 @@ output "debian12_cis_cnspec" {
value = module.debian12_cis_cnspec.public_ip == null ? "" : "ssh -o StrictHostKeyChecking=no -i ~/.ssh/${var.aws_key_pair_name} admin@${module.debian12_cis_cnspec.public_ip}"
}

# debian13
output "debian13" {
value = module.debian13.public_ip == null ? "" : "ssh -o StrictHostKeyChecking=no -i ~/.ssh/${var.aws_key_pair_name} admin@${module.debian13.public_ip}"
}

output "debian13_cnspec" {
value = module.debian13_cnspec.public_ip == null ? "" : "ssh -o StrictHostKeyChecking=no -i ~/.ssh/${var.aws_key_pair_name} admin@${module.debian13_cnspec.public_ip}"
}

// CIS Debian 13 - uncomment when CIS image is available
// output "debian13_cis" {
// value = module.debian13_cis.public_ip == null ? "" : "ssh -o StrictHostKeyChecking=no -i ~/.ssh/${var.aws_key_pair_name} admin@${module.debian13_cis.public_ip}"
// }

// output "debian13_cis_cnspec" {
// value = module.debian13_cis_cnspec.public_ip == null ? "" : "ssh -o StrictHostKeyChecking=no -i ~/.ssh/${var.aws_key_pair_name} admin@${module.debian13_cis_cnspec.public_ip}"
// }

# suse15
output "suse15" {
value = module.suse15.public_ip == null ? "" : "ssh -o StrictHostKeyChecking=no -i ~/.ssh/${var.aws_key_pair_name} ec2-user@${module.suse15.public_ip}"
Expand Down
17 changes: 17 additions & 0 deletions aws/ec2-instances/variables.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -236,6 +236,23 @@ variable "create_debian12_cis_cnspec" {
default = false
}

variable "create_debian13" {
default = false
}

variable "create_debian13_cnspec" {
default = false
}

// CIS Debian 13 - uncomment when CIS image is available
// variable "create_debian13_cis" {
// default = false
// }

// variable "create_debian13_cis_cnspec" {
// default = false
// }

variable "create_suse15" {
default = false
}
Expand Down
Loading