initial commit

Author: Zach-Johnson

modules/core/main.tf

@@ -58,34 +58,34 @@ resource "docker_container" "core" {
 
   log_driver = var.docker_log_driver
 
-  # data transport
+  # http connections to portal or api
   ports {
-    internal = 5353
-    external = 5353
+    internal = 80
+    external = 80
   }
 
-  # http configuration
+  # https connections to portal or api
   ports {
-    internal = 3300
-    external = 3302
+    internal = 443
+    external = 443
   }
 
-  # service proxy
+  # http configuration
   ports {
-    internal = 9090
-    external = 9092
+    internal = 3300
+    external = 3302
   }
 
-  # https connections to portal or api
+  # data transport
   ports {
-    internal = 443
-    external = 443
+    internal = 5353
+    external = 5353
   }
 
-  # http connections to portal or api
+  # service proxy
   ports {
-    internal = 80
-    external = 80
+    internal = 9090
+    external = 9092
   }
 
   healthcheck {

modules/core/variables.tf

@@ -1,5 +1,5 @@
 variable "docker_image_tag" {
-  default     = "2.3.0"
+  default     = "2.3.1"
   description = "The image tag of the Docker image. Defaults to the latest GA version number."
 }
 

modules/data/main.tf

@@ -113,10 +113,12 @@ resource "docker_container" "data" {
     external = 3300
   }
 
-  # service proxy
-  ports {
-    internal = 9090
-    external = 9090
+  dynamic "ports" {
+    for_each = var.cluster_id != null ? list(var.cluster_id) : []
+    content {
+      internal = 5353
+      external = 5353
+    }
   }
 
   # metrics export
@@ -125,12 +127,10 @@ resource "docker_container" "data" {
     external = 8686
   }
 
-  dynamic "ports" {
-    for_each = var.cluster_id != null ? list(var.cluster_id) : []
-    content {
-      internal = 5353
-      external = 5353
-    }
+  # service proxy
+  ports {
+    internal = 9090
+    external = 9090
   }
 
   # enable ipv6 for loopback

modules/data/variables.tf

@@ -1,5 +1,5 @@
 variable "docker_image_tag" {
-  default     = "2.3.0"
+  default     = "2.3.1"
   description = "The image tag of the Docker image. Defaults to the latest GA version number."
 }
 

modules/dhcp/variables.tf

@@ -1,5 +1,5 @@
 variable "docker_image_tag" {
-  default     = "2.3.0"
+  default     = "2.3.1"
   description = "The image tag of the Docker image. Defaults to the latest GA version number."
 }
 

modules/dist/main.tf

@@ -59,12 +59,6 @@ resource "docker_container" "dist" {
     external = 3304
   }
 
-  # service proxy
-  ports {
-    internal = 9090
-    external = 9094
-  }
-
   # data transport
   ports {
     internal = 5353
@@ -74,6 +68,12 @@ resource "docker_container" "dist" {
     # as core?
   }
 
+  # service proxy
+  ports {
+    internal = 9090
+    external = 9094
+  }
+
   # enable ipv6 for loopback
   sysctls = {
     "net.ipv6.conf.lo.disable_ipv6" = "0"

modules/dist/variables.tf

@@ -1,5 +1,5 @@
 variable "docker_image_tag" {
-  default     = "2.3.0"
+  default     = "2.3.1"
   description = "The image tag of the Docker image. Defaults to the latest GA version number."
 }
 

modules/dns/main.tf

@@ -53,17 +53,13 @@ resource "docker_container" "dns" {
 
   log_driver = var.docker_log_driver
 
-  # http configuration
+  # tcp port for dns
   ports {
-    internal = 3300
-    external = 3301
+    internal = 53
+    external = 53
+    protocol = "tcp"
   }
 
-  # service proxy
-  ports {
-    internal = 9090
-    external = 9091
-  }
 
   # udp port for dns
   ports {
@@ -72,11 +68,17 @@ resource "docker_container" "dns" {
     protocol = "udp"
   }
 
-  # tcp port for dns
+
+  # http configuration
   ports {
-    internal = 53
-    external = 53
-    protocol = "tcp"
+    internal = 3300
+    external = 3301
+  }
+
+  # service proxy
+  ports {
+    internal = 9090
+    external = 9091
   }
 
   healthcheck {

modules/dns/variables.tf

@@ -1,5 +1,5 @@
 variable "docker_image_tag" {
-  default     = "2.3.0"
+  default     = "2.3.1"
   description = "The image tag of the Docker image. Defaults to the latest GA version number."
 }
 

modules/xfr/main.tf

@@ -53,16 +53,11 @@ resource "docker_container" "xfr" {
 
   hostname = var.hostname
 
-  # http configuration
-  ports {
-    internal = 3300
-    external = 3303
-  }
-
-  # service proxy
+  # tcp zone transfers
   ports {
-    internal = 9090
-    external = 9093
+    internal = 53
+    external = 5400
+    protocol = "tcp"
   }
 
   # udp zone transfers
@@ -72,11 +67,17 @@ resource "docker_container" "xfr" {
     protocol = "udp"
   }
 
-  # tcp zone transfers
+
+  # http configuration
   ports {
-    internal = 53
-    external = 5400
-    protocol = "tcp"
+    internal = 3300
+    external = 3303
+  }
+
+  # service proxy
+  ports {
+    internal = 9090
+    external = 9093
   }
 
   healthcheck {