add use_elastic_ips setting

ryanplasma · Oct 14, 2022 · 20e92c3 · 20e92c3
1 parent 7953628
commit 20e92c3
Show file tree

Hide file tree

Showing 7 changed files with 7 additions and 6 deletions.
diff --git a/configs/attack_range_default.yml b/configs/attack_range_default.yml
@@ -23,6 +23,7 @@ aws:
   private_key_path: "~/.ssh/id_rsa"
   cloudtrail: "0"
   cloudtrail_sqs_queue: "https://sqs.us-west-2.amazonaws.com/111111111111/cloudtrail-cloud-attack-range"
+  use_elastic_ips: "1"
 azure:
   location: "West Europe"
   subscription_id: "xxx"

diff --git a/terraform/aws/modules/kali-server/resources.tf b/terraform/aws/modules/kali-server/resources.tf
@@ -41,6 +41,6 @@ resource "aws_instance" "kali_machine" {
 }
 
 resource "aws_eip" "kali_ip" {
-  count    = var.kali_server.kali_server == "1" ? 1 : 0
+  count    = (var.kali_server.kali_server == "1") && (var.aws.use_elastic_ips == "1") ? 1 : 0
   instance = aws_instance.kali_machine[0].id
 }
diff --git a/terraform/aws/modules/linux-server/resources.tf b/terraform/aws/modules/linux-server/resources.tf
@@ -69,6 +69,6 @@ resource "aws_instance" "linux_server" {
 }
 
 resource "aws_eip" "linux_server_ip" {
-  count = length(var.linux_servers)
+  count = (var.aws.use_elastic_ips == "1") ? length(var.linux_servers) : 0
   instance = aws_instance.linux_server[count.index].id
 }
diff --git a/terraform/aws/modules/nginx-server/resources.tf b/terraform/aws/modules/nginx-server/resources.tf
@@ -70,6 +70,6 @@ resource "aws_instance" "nginx_server" {
 }
 
 resource "aws_eip" "nginx_server_ip" {
-  count = var.nginx_server.nginx_server == "1" ? 1 : 0
+  count = (var.nginx_server.nginx_server == "1") && (var.aws.use_elastic_ips == "1") ? 1 : 0
   instance = aws_instance.nginx_server[count.index].id
 }
diff --git a/terraform/aws/modules/phantom-server/resources.tf b/terraform/aws/modules/phantom-server/resources.tf
@@ -67,6 +67,6 @@ resource "aws_instance" "phantom-server" {
 }
 
 resource "aws_eip" "phantom_ip" {
-  count    = var.phantom_server.phantom_server == "1" ? 1 : 0
+  count    = (var.phantom_server.phantom_server == "1") && (var.aws.use_elastic_ips == "1") ? 1 : 0
   instance = aws_instance.phantom-server[0].id
 }
diff --git a/terraform/aws/modules/splunk-server/resources.tf b/terraform/aws/modules/splunk-server/resources.tf
@@ -130,6 +130,6 @@ resource "aws_instance" "splunk-server" {
 }
 
 resource "aws_eip" "splunk_ip" {
-  count = var.splunk_server.byo_splunk == "0" ? 1 : 0
+  count = (var.splunk_server.byo_splunk == "0") && (var.aws.use_elastic_ips == "1") ? 1 : 0
   instance = aws_instance.splunk-server[0].id
 }
diff --git a/terraform/aws/modules/windows/resources.tf b/terraform/aws/modules/windows/resources.tf
@@ -87,6 +87,6 @@ EOF
 }
 
 resource "aws_eip" "windows_ip" {
-  count = length(var.windows_servers)
+  count = (var.aws.use_elastic_ips == "1") ? length(var.windows_servers) : 0
   instance = aws_instance.windows_server[count.index].id
 }