diff --git a/docker/Dockerfile b/docker/Dockerfile index 1895f144..b0f34aee 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -4,7 +4,7 @@ ENV DEBIAN_FRONTEND=noninteractive RUN apt-get update && \ apt-get install -y python3.8 git unzip python3-pip awscli curl vim lsb-release software-properties-common -RUN curl -s https://releases.hashicorp.com/terraform/1.1.8/terraform_1.1.8_linux_amd64.zip -o terraform.zip && \ +RUN curl -s https://releases.hashicorp.com/terraform/1.4.5/terraform_1.4.5_linux_amd64.zip -o terraform.zip && \ unzip terraform.zip && \ mv terraform /usr/local/bin/ diff --git a/terraform/aws/modules/kali-server/resources.tf b/terraform/aws/modules/kali-server/resources.tf index 7072c823..f2808dfd 100644 --- a/terraform/aws/modules/kali-server/resources.tf +++ b/terraform/aws/modules/kali-server/resources.tf @@ -23,6 +23,8 @@ resource "aws_instance" "kali_machine" { subnet_id = var.ec2_subnet_id vpc_security_group_ids = [var.vpc_security_group_ids] private_ip = "10.0.1.30" + associate_public_ip_address = true + tags = { Name = "ar-kali-${var.general.key_name}-${var.general.attack_range_name}" } diff --git a/terraform/aws/modules/linux-server/resources.tf b/terraform/aws/modules/linux-server/resources.tf index 608d49a0..e4ef53f4 100644 --- a/terraform/aws/modules/linux-server/resources.tf +++ b/terraform/aws/modules/linux-server/resources.tf @@ -34,6 +34,7 @@ resource "aws_instance" "linux_server" { subnet_id = var.ec2_subnet_id vpc_security_group_ids = [var.vpc_security_group_ids] private_ip = "10.0.1.${21 + count.index}" + associate_public_ip_address = true root_block_device { volume_type = "gp2" diff --git a/terraform/aws/modules/nginx-server/resources.tf b/terraform/aws/modules/nginx-server/resources.tf index 90c3c85b..796f081a 100644 --- a/terraform/aws/modules/nginx-server/resources.tf +++ b/terraform/aws/modules/nginx-server/resources.tf @@ -35,7 +35,8 @@ resource "aws_instance" "nginx_server" { subnet_id = var.ec2_subnet_id vpc_security_group_ids = [var.vpc_security_group_ids] private_ip = "10.0.1.31" - + associate_public_ip_address = true + root_block_device { volume_type = "gp2" volume_size = "20" diff --git a/terraform/aws/modules/phantom-server/resources.tf b/terraform/aws/modules/phantom-server/resources.tf index 98761fa2..a6765b2c 100644 --- a/terraform/aws/modules/phantom-server/resources.tf +++ b/terraform/aws/modules/phantom-server/resources.tf @@ -40,6 +40,7 @@ resource "aws_instance" "phantom-server" { subnet_id = var.ec2_subnet_id vpc_security_group_ids = [var.vpc_security_group_ids] private_ip = "10.0.1.13" + associate_public_ip_address = true root_block_device { volume_type = "gp2" volume_size = "30" diff --git a/terraform/aws/modules/windows/resources.tf b/terraform/aws/modules/windows/resources.tf index 80323664..94dbd3b9 100644 --- a/terraform/aws/modules/windows/resources.tf +++ b/terraform/aws/modules/windows/resources.tf @@ -34,6 +34,7 @@ resource "aws_instance" "windows_server" { subnet_id = var.ec2_subnet_id private_ip = "10.0.1.${14 + count.index}" vpc_security_group_ids = [var.vpc_security_group_ids] + associate_public_ip_address = true tags = { Name = "ar-win-${var.general.key_name}-${var.general.attack_range_name}-${count.index}" } diff --git a/terraform/aws/modules/zeek-server/ressources.tf b/terraform/aws/modules/zeek-server/ressources.tf index 2a5b02ac..8f6f9802 100644 --- a/terraform/aws/modules/zeek-server/ressources.tf +++ b/terraform/aws/modules/zeek-server/ressources.tf @@ -34,6 +34,8 @@ resource "aws_instance" "zeek_sensor" { subnet_id = var.ec2_subnet_id vpc_security_group_ids = [var.vpc_security_group_ids] private_ip = "10.0.1.50" + associate_public_ip_address = true + tags = { Name = "ar-zeek-${var.general.key_name}-${var.general.attack_range_name}" }