Skip to content
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

Jump to bottom

⭐ Add CIS RHEL 7 Benchmark Level 2 #61

Merged
merged 5 commits into from
May 29, 2024
Merged

⭐ Add CIS RHEL 7 Benchmark Level 2 #61

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
bd92ba5
add: rhel7_cis_cnspec
mm-weber May 28, 2024
944f1ac
add: rhel7_cis_cnspec -> ami+vars
mm-weber May 28, 2024
d1c78c5
add: rhel7_cis_cnspec -> Readme.md
mm-weber May 28, 2024
1f87538
add: rhel7_cis -> ami+vars
mm-weber May 28, 2024
6d3c58f
update: win2019/win2022 amis
mm-weber May 28, 2024
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
2 changes: 2 additions & 0 deletions aws/ec2-instances/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,8 @@ This repository contains Terraform code for provisioning AWS EC2 instances for t
| Oracle 8 cnspec | Latest Oracle 8 image with latest cnspec | `create_oracle8_cnspec` | |
| Oracle 8 CIS | CIS Oracle Linux 8 Benchmark - Level 1 | `create_oracle8_cis` | [CIS Oracle Linux 8 Benchmark - Level 1](https://aws.amazon.com/marketplace/pp/prodview-qohiqfju7iecs?sr=0-1&ref_=beagle&applicationId=AWSMPContessa) |
| Oracle 8 CIS cnspec | CIS Oracle Linux 8 Benchmark - Level 1 with latest cnspec | `create_oracle8_cis_cnspec` | [CIS Oracle Linux 8 Benchmark - Level 1](https://aws.amazon.com/marketplace/pp/prodview-qohiqfju7iecs?sr=0-1&ref_=beagle&applicationId=AWSMPContessa) |
| RHEL 7 CIS | CIS Red Hat Enterprise Linux 7 Benchmark - Level 2 | `create_rhel7_cis` | [CIS Red Hat Enterprise Linux 7 Benchmark - Level 2](https://aws.amazon.com/marketplace/server/procurement?productId=03540ff7-d998-4f87-888a-db80e0f993ef) |
| RHEL 7 CIS cnspec | CIS Red Hat Enterprise Linux 7 Benchmark - Level 2 with latest cnspec | `create_rhel7_cis_cnspec` | [CIS Red Hat Enterprise Linux 7 Benchmark - Level 2](https://aws.amazon.com/marketplace/server/procurement?productId=03540ff7-d998-4f87-888a-db80e0f993ef) |
| RHEL 8 | Latest Red Hat Enterprise Linux 8 | `create_rhel8` | |
| RHEL 8 cnspec | Latest Red Hat Enterprise Linux 8 with latest cnspec | `create_rhel8_cnspec` | |
| RHEL 8 CIS | CIS Red Hat Enterprise Linux 8 STIG Benchmark | `create_rhel8_cis` | [CIS Red Hat Enterprise Linux 8 STIG Benchmark](https://aws.amazon.com/marketplace/pp/prodview-ia2nfuoig3jmu?sr=0-3&ref_=beagle&applicationId=AWSMPContessa) |
Expand Down
22 changes: 19 additions & 3 deletions aws/ec2-instances/amis.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,6 +81,22 @@ data "aws_ami" "rhel8_cis" {
owners = ["679593333241"]
}

data "aws_ami" "rhel7_cis" {
most_recent = true

filter {
name = "name"
values = ["CIS Red Hat Enterprise Linux 7*Level 2*"]
}

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

owners = ["679593333241"]
}


data "aws_ami" "nginx_rhel9_cis" {
most_recent = true
Expand Down Expand Up @@ -188,7 +204,7 @@ data "aws_ami" "ubuntu2204_cis" {
}

filter {
name = "architecture"
name = "architecture"
values = ["x86_64"]
}

Expand Down Expand Up @@ -467,7 +483,7 @@ data "aws_ami" "winserver2019_cis" {

filter {
name = "name"
values = ["CIS Microsoft Windows Server 2019 Benchmark v2*Level 2*"]
values = ["CIS Microsoft Windows Server 2019 Benchmark *Level 2*"]
}

filter {
Expand Down Expand Up @@ -499,7 +515,7 @@ data "aws_ami" "winserver2022_cis" {

filter {
name = "name"
values = ["CIS Microsoft Windows Server 2022 Benchmark v2*Level 2*"]
values = ["CIS Microsoft Windows Server 2022 Benchmark *Level 2*"]
}

filter {
Expand Down
45 changes: 39 additions & 6 deletions aws/ec2-instances/main.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -425,7 +425,7 @@ module "oracle8_cis_cnspec" {
module "rhel9" {
source = "terraform-aws-modules/ec2-instance/aws"
version = "~> 5.2.1"

create = var.create_rhel9
name = "${var.prefix}-rhel9-${random_id.instance_id.id}"
ami = data.aws_ami.rhel9.id
Expand All @@ -439,7 +439,7 @@ module "rhel9" {
module "rhel9_cnspec" {
source = "terraform-aws-modules/ec2-instance/aws"
version = "~> 5.2.1"

create = var.create_rhel9_cnspec
name = "${var.prefix}-rhel9-cnspec-${random_id.instance_id.id}"
ami = data.aws_ami.rhel9.id
Expand All @@ -457,7 +457,7 @@ module "rhel9_cnspec" {
module "rhel8" {
source = "terraform-aws-modules/ec2-instance/aws"
version = "~> 5.2.1"

create = var.create_rhel8
name = "${var.prefix}-rhel8-${random_id.instance_id.id}"
ami = data.aws_ami.rhel8.id
Expand All @@ -471,7 +471,7 @@ module "rhel8" {
module "rhel8_cnspec" {
source = "terraform-aws-modules/ec2-instance/aws"
version = "~> 5.2.1"

create = var.create_rhel8_cnspec
name = "${var.prefix}-rhel8-cnspec-${random_id.instance_id.id}"
ami = data.aws_ami.rhel8.id
Expand All @@ -487,7 +487,7 @@ module "rhel8_cnspec" {
module "rhel8_cis" {
source = "terraform-aws-modules/ec2-instance/aws"
version = "~> 5.2.1"

create = var.create_rhel8_cis
name = "${var.prefix}-rhel8-cis-${random_id.instance_id.id}"
ami = data.aws_ami.rhel8_cis.id
Expand All @@ -501,7 +501,7 @@ module "rhel8_cis" {
module "rhel8_cis_cnspec" {
source = "terraform-aws-modules/ec2-instance/aws"
version = "~> 5.2.1"

create = var.create_rhel8_cis_cnspec
name = "${var.prefix}-rhel8-cis-cnspec-${random_id.instance_id.id}"
ami = data.aws_ami.rhel8_cis.id
Expand All @@ -514,6 +514,39 @@ module "rhel8_cis_cnspec" {
user_data_replace_on_change = true
}

// Red Hat Linux 7
module "rhel7_cis" {
source = "terraform-aws-modules/ec2-instance/aws"
version = "~> 5.2.1"

create = var.create_rhel7_cis
name = "${var.prefix}-rhel7-cis-${random_id.instance_id.id}"
ami = data.aws_ami.rhel7_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 "rhel7_cis_cnspec" {
source = "terraform-aws-modules/ec2-instance/aws"
version = "~> 5.2.1"

create = var.create_rhel7_cis_cnspec
name = "${var.prefix}-rhel7-cis-cnspec-${random_id.instance_id.id}"
ami = data.aws_ami.rhel7_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
}


// NGINX on RHEL 9 CIS

module "nginx_rhel9_cis" {
Expand Down
8 changes: 8 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 @@ -167,6 +167,14 @@ variable "create_rhel8_cis_cnspec" {
default = false
}

variable "create_rhel7_cis" {
default = false
}

variable "create_rhel7_cis_cnspec" {
default = false
}

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