trinitor/DetectionLab
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Upgrade to terraform 0.12

Browse Source 
Resolves #291
This commit is contained in:
Andrew Svoboda
2019-06-04 13:45:12 +01:00
parent a68591a091
commit 28f1fc9372
6 changed files with 70 additions and 60 deletions
Download Patch File Download Diff File Expand all files Collapse all files

83
Terraform/main.tf
View File

@@ -1,8 +1,8 @@
# Specify the provider and access details
provider "aws" {
shared_credentials_file = "${var.shared_credentials_file}"
region = "${var.region}"
profile = "${var.profile}"
shared_credentials_file = var.shared_credentials_file
region = var.region
profile = var.profile
}
# Create a VPC to launch our instances into
@@ -12,48 +12,48 @@ resource "aws_vpc" "default" {
# Create an internet gateway to give our subnet access to the outside world
resource "aws_internet_gateway" "default" {
vpc_id = "${aws_vpc.default.id}"
vpc_id = aws_vpc.default.id
}
# Grant the VPC internet access on its main route table
resource "aws_route" "internet_access" {
route_table_id = "${aws_vpc.default.main_route_table_id}"
route_table_id = aws_vpc.default.main_route_table_id
destination_cidr_block = "0.0.0.0/0"
gateway_id = "${aws_internet_gateway.default.id}"
gateway_id = aws_internet_gateway.default.id
}
# Create a subnet to launch our instances into
resource "aws_subnet" "default" {
vpc_id = "${aws_vpc.default.id}"
vpc_id = aws_vpc.default.id
cidr_block = "192.168.38.0/24"
availability_zone = "${var.availability_zone}"
availability_zone = var.availability_zone
map_public_ip_on_launch = true
}
# Adjust VPC DNS settings to not conflict with lab
resource "aws_vpc_dhcp_options" "default" {
domain_name = "windomain.local"
domain_name_servers = ["${aws_instance.dc.private_ip}", "${var.external_dns_servers}"]
netbios_name_servers = ["${aws_instance.dc.private_ip}"]
domain_name_servers = [aws_instance.dc.private_ip, var.external_dns_servers]
netbios_name_servers = [aws_instance.dc.private_ip]
}
resource "aws_vpc_dhcp_options_association" "default" {
vpc_id = "${aws_vpc.default.id}"
dhcp_options_id = "${aws_vpc_dhcp_options.default.id}"
vpc_id = aws_vpc.default.id
dhcp_options_id = aws_vpc_dhcp_options.default.id
}
# Our default security group for the logger host
resource "aws_security_group" "logger" {
name = "logger_security_group"
description = "DetectionLab: Security Group for the logger host"
vpc_id = "${aws_vpc.default.id}"
vpc_id = aws_vpc.default.id
# SSH access
ingress {
from_port = 22
to_port = 22
protocol = "tcp"
cidr_blocks = "${var.ip_whitelist}"
cidr_blocks = var.ip_whitelist
}
# Splunk access
@@ -61,7 +61,7 @@ resource "aws_security_group" "logger" {
from_port = 8000
to_port = 8000
protocol = "tcp"
cidr_blocks = "${var.ip_whitelist}"
cidr_blocks = var.ip_whitelist
}
# Fleet access
@@ -69,7 +69,7 @@ resource "aws_security_group" "logger" {
from_port = 8412
to_port = 8412
protocol = "tcp"
cidr_blocks = "${var.ip_whitelist}"
cidr_blocks = var.ip_whitelist
}
# Allow all traffic from the private subnet
@@ -92,14 +92,14 @@ resource "aws_security_group" "logger" {
resource "aws_security_group" "windows" {
name = "windows_security_group"
description = "DetectionLab: Security group for the Windows hosts"
vpc_id = "${aws_vpc.default.id}"
vpc_id = aws_vpc.default.id
# RDP
ingress {
from_port = 3389
to_port = 3389
protocol = "tcp"
cidr_blocks = "${var.ip_whitelist}"
cidr_blocks = var.ip_whitelist
}
# WinRM
@@ -107,7 +107,7 @@ resource "aws_security_group" "windows" {
from_port = 5985
to_port = 5986
protocol = "tcp"
cidr_blocks = "${var.ip_whitelist}"
cidr_blocks = var.ip_whitelist
}
# Windows ATA
@@ -115,7 +115,7 @@ resource "aws_security_group" "windows" {
from_port = 443
to_port = 443
protocol = "tcp"
cidr_blocks = "${var.ip_whitelist}"
cidr_blocks = var.ip_whitelist
}
# Allow all traffic from the private subnet
@@ -136,23 +136,24 @@ resource "aws_security_group" "windows" {
}
resource "aws_key_pair" "auth" {
key_name = "${var.public_key_name}"
public_key = "${file("${var.public_key_path}")}"
key_name = var.public_key_name
public_key = file(var.public_key_path)
}
resource "aws_instance" "logger" {
instance_type = "t2.medium"
ami = "${coalesce(data.aws_ami.logger_ami.image_id, var.logger_ami)}"
ami = coalesce(data.aws_ami.logger_ami.image_id, var.logger_ami)
tags {
tags = {
Name = "logger"
}
subnet_id = "${aws_subnet.default.id}"
vpc_security_group_ids = ["${aws_security_group.logger.id}"]
key_name = "${aws_key_pair.auth.key_name}"
subnet_id = aws_subnet.default.id
vpc_security_group_ids = [aws_security_group.logger.id]
key_name = aws_key_pair.auth.key_name
private_ip = "192.168.38.105"
# Provision the AWS Ubuntu 16.04 AMI from scratch.
# Provision the AWS Ubuntu 16.04 AMI from scratch.
provisioner "remote-exec" {
inline = [
@@ -172,9 +173,10 @@ resource "aws_instance" "logger" {
]
connection {
host = coalesce(self.public_ip, self.private_ip)
type = "ssh"
user = "ubuntu"
private_key = "${file("${var.private_key_path}")}"
private_key = file(var.private_key_path)
}
}
@@ -188,14 +190,14 @@ resource "aws_instance" "dc" {
instance_type = "t2.medium"
# Uses the local variable if external data source resolution fails
ami = "${coalesce(data.aws_ami.dc_ami.image_id, var.dc_ami)}"
ami = coalesce(data.aws_ami.dc_ami.image_id, var.dc_ami)
tags {
tags = {
Name = "dc.windomain.local"
}
subnet_id = "${aws_subnet.default.id}"
vpc_security_group_ids = ["${aws_security_group.windows.id}"]
subnet_id = aws_subnet.default.id
vpc_security_group_ids = [aws_security_group.windows.id]
private_ip = "192.168.38.102"
root_block_device {
@@ -207,14 +209,14 @@ resource "aws_instance" "wef" {
instance_type = "t2.medium"
# Uses the local variable if external data source resolution fails
ami = "${coalesce(data.aws_ami.wef_ami.image_id, var.wef_ami)}"
ami = coalesce(data.aws_ami.wef_ami.image_id, var.wef_ami)
tags {
tags = {
Name = "wef.windomain.local"
}
subnet_id = "${aws_subnet.default.id}"
vpc_security_group_ids = ["${aws_security_group.windows.id}"]
subnet_id = aws_subnet.default.id
vpc_security_group_ids = [aws_security_group.windows.id]
private_ip = "192.168.38.103"
root_block_device {
@@ -226,17 +228,18 @@ resource "aws_instance" "win10" {
instance_type = "t2.medium"
# Uses the local variable if external data source resolution fails
ami = "${coalesce(data.aws_ami.win10_ami.image_id, var.win10_ami)}"
ami = coalesce(data.aws_ami.win10_ami.image_id, var.win10_ami)
tags {
tags = {
Name = "win10.windomain.local"
}
subnet_id = "${aws_subnet.default.id}"
vpc_security_group_ids = ["${aws_security_group.windows.id}"]
subnet_id = aws_subnet.default.id
vpc_security_group_ids = [aws_security_group.windows.id]
private_ip = "192.168.38.104"
root_block_device {
delete_on_termination = true
}
}