Merge pull request #8 from terraform-modules/setup_sg_it-linux-base

Setup sg it linux base
terraform-modules · Aug 5, 2020 · 56b7dc1 · 56b7dc1
2 parents 3f382e4 + a36b468
commit 56b7dc1
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 20 deletions.
diff --git a/it-linux-base/README.md b/it-linux-base/README.md
@@ -54,4 +54,3 @@ module "it-linux-base" {
 |------|-------------|
 | this\_security\_group\_arn | Created security group ARN |
 | this\_security\_group\_id | Created security group ID |
-
diff --git a/it-linux-base/main.tf b/it-linux-base/main.tf
@@ -112,9 +112,9 @@ resource "aws_security_group" "this_security_group" {
   }
 
   tags = merge(
-    map("Name", "sg-${local.name}"),
     var.tags,
     map("boc:tf_module_version", var._module_version),
     map("boc:vpc:info", join(" ", compact(list(var.vpc_id, var.vpc_full_name)))),
+    map("Name", "sg-${local.name}"),
   )
 }
diff --git a/it-linux-base/ports.tf b/it-linux-base/ports.tf
@@ -12,27 +12,27 @@ locals {
   n_mgmt        = ["148.129.162.0/24", "148.129.95.0/24"]
   source_groups = ["all", "external"]
   name          = var.name
-  ports = [ 
-    [ -1, -1, "icmp", "ICMP", local.n_all, ["external"] ],
-    [ 22, 22, "tcp", "SSH", local.n_census, ["external"] ],
-    [ 25, 25, "tcp", "SMTP", local.n_all, ["external"] ],
-    [ 123, 123, "udp", "NTP", local.n_all, ["external"] ],
-    [ 161, 161, "udp", "SNMP", local.n_all, ["external"] ],
-    [ 443, 443, "tcp", "https", local.n_all, ["external"] ],
-    [ 4949, 4949, "tcp", "Munin", local.n_mgmt, ["external"] ],
-    [ 5001, 5003, "tcp", "iperf", local.n_all, ["external"] ],
-    [ 5001, 5003, "udp", "iperf", local.n_all, ["external"] ],
+  ports = [
+    [-1, -1, "icmp", "ICMP", local.n_all, ["external"]],
+    [22, 22, "tcp", "SSH", local.n_census, ["external"]],
+    [25, 25, "tcp", "SMTP", local.n_all, ["external"]],
+    [123, 123, "udp", "NTP", local.n_all, ["external"]],
+    [161, 161, "udp", "SNMP", local.n_all, ["external"]],
+    [443, 443, "tcp", "https", local.n_all, ["external"]],
+    [4949, 4949, "tcp", "Munin", local.n_mgmt, ["external"]],
+    [5001, 5003, "tcp", "iperf", local.n_all, ["external"]],
+    [5001, 5003, "udp", "iperf", local.n_all, ["external"]],
 
-    [ 1556, 1556, "tcp", "Netbackup", local.n_all, ["external"] ],
-    [ 13724, 13724, "tcp", "Netbackup", local.n_all, ["external"] ],
-    [ 13782, 13782, "tcp", "Netbackup", local.n_all, ["external"] ],
+    [1556, 1556, "tcp", "Netbackup", local.n_all, ["external"]],
+    [13724, 13724, "tcp", "Netbackup", local.n_all, ["external"]],
+    [13782, 13782, "tcp", "Netbackup", local.n_all, ["external"]],
 
-    [ 1830, 1830, "tcp", "Oracle-OEM", ["10.193.8.0/23" ], ["external"]],
+    [1830, 1830, "tcp", "Oracle-OEM", ["10.193.8.0/23"], ["external"]],
 
-    [ 1002, 1002, "tcp", "OPSware-Control", local.n_all, ["external"] ],
-    [ 9080, 9080, "tcp", "", [local.n_census[2] ], ["external"]],
-    [ 10082, 10082, "tcp", "Netbackup-spoold", local.n_all, ["external"] ],
-    [ 10102, 10102, "tcp", "Netbackup-spad", local.n_all, ["external"] ],
+    [1002, 1002, "tcp", "OPSware-Control", local.n_all, ["external"]],
+    [9080, 9080, "tcp", "", [local.n_census[2]], ["external"]],
+    [10082, 10082, "tcp", "Netbackup-spoold", local.n_all, ["external"]],
+    [10102, 10102, "tcp", "Netbackup-spad", local.n_all, ["external"]],
   ]
 
   # these are ignored