diff --git a/playbooks/fast.yml b/playbooks/fast.yml index cbc46f7..9124060 100644 --- a/playbooks/fast.yml +++ b/playbooks/fast.yml @@ -52,7 +52,7 @@ state: started recreate: true restart_policy: unless-stopped - memory: 425m + memory: 300m memory_swap: 900m ports: [80:80, 2222:2222, 443:443, "22:22"] env: diff --git a/playbooks/slow.yml b/playbooks/slow.yml index f851fb0..e8cb15c 100644 --- a/playbooks/slow.yml +++ b/playbooks/slow.yml @@ -82,7 +82,7 @@ state: started recreate: true restart_policy: unless-stopped - memory: 425m + memory: 300m memory_swap: 900m ports: [80:80, 2222:2222, 443:443, "22:22"] env: diff --git a/terraform/main.tf b/terraform/main.tf index 69704ec..12a99ae 100644 --- a/terraform/main.tf +++ b/terraform/main.tf @@ -18,7 +18,7 @@ resource "aws_instance" "this" { subnet_id = module.vpc.public_subnets[0] user_data = file("install.sh") - user_data_replace_on_change = true + user_data_replace_on_change = false iam_instance_profile = aws_iam_instance_profile.ssm.name vpc_security_group_ids = [aws_security_group.public_access.id] diff --git a/terraform/network.tf b/terraform/network.tf index a93837d..4c84290 100644 --- a/terraform/network.tf +++ b/terraform/network.tf @@ -32,8 +32,8 @@ resource "aws_security_group" "public_access" { tags = { GroupOf = "Main", GroupType = "Public" } } -resource "aws_vpc_security_group_ingress_rule" "ingress" { - for_each = toset(["80", "443", "22", "2222", "81", "8080", "4321", "1234"]) +resource "aws_vpc_security_group_ingress_rule" "tcp" { + for_each = toset(["80", "443", "22", "51821"]) security_group_id = aws_security_group.public_access.id @@ -43,6 +43,17 @@ resource "aws_vpc_security_group_ingress_rule" "ingress" { cidr_ipv4 = "0.0.0.0/0" } +resource "aws_vpc_security_group_ingress_rule" "udp" { + for_each = toset(["51820", "53"]) + + security_group_id = aws_security_group.public_access.id + + from_port = each.value + to_port = each.value + ip_protocol = "udp" + cidr_ipv4 = "0.0.0.0/0" +} + resource "aws_vpc_security_group_egress_rule" "egress" { for_each = toset(["-1"])