From 641e76cf9dbf96e3460c8f86339e923764e6c002 Mon Sep 17 00:00:00 2001
From: Matthew Baggett <matthew@baggett.me>
Date: Fri, 14 Feb 2025 21:30:49 +0100
Subject: [PATCH] Housekeeping

---
 products/docker_registry/outputs.tf   |  3 +++
 products/frigate/frigate.tf           |  2 ++
 products/frigate/inputs.tf            |  1 +
 products/mqtt/mqtt.tf                 |  2 +-
 products/mysql/mysql.tf               |  2 ++
 products/openhaystack/openhaystack.tf |  2 +-
 products/pgbackweb/outputs.tf         |  3 +++
 products/redis/redis.tf               | 10 +++++-----
 products/traefik/network.tf           |  6 +++++-
 products/traefik/outputs.tf           |  2 +-
 10 files changed, 24 insertions(+), 9 deletions(-)

diff --git a/products/docker_registry/outputs.tf b/products/docker_registry/outputs.tf
index ab377fe..3c8957a 100644
--- a/products/docker_registry/outputs.tf
+++ b/products/docker_registry/outputs.tf
@@ -8,4 +8,7 @@ output "registry_user_login" {
 }
 output "domain" {
   value = var.domain
+}
+output "endpoint" {
+  value = "https://${var.domain}"
 }
\ No newline at end of file
diff --git a/products/frigate/frigate.tf b/products/frigate/frigate.tf
index e72824b..cfdac5c 100644
--- a/products/frigate/frigate.tf
+++ b/products/frigate/frigate.tf
@@ -1,5 +1,6 @@
 module "frigate" {
   source                = "../../docker/service"
+  enable                = var.enable
   image                 = "ghcr.io/blakeblackshear/frigate:stable"
   stack_name            = var.stack_name
   service_name          = "frigate"
@@ -9,6 +10,7 @@ module "frigate" {
   environment_variables = {
     FRIGATE_RTSP_PASSWORD = var.frigate_rtsp_password
   }
+  networks        = var.networks
   labels          = var.labels
   converge_enable = false
 }
\ No newline at end of file
diff --git a/products/frigate/inputs.tf b/products/frigate/inputs.tf
index 99fa416..e71c242 100644
--- a/products/frigate/inputs.tf
+++ b/products/frigate/inputs.tf
@@ -6,6 +6,7 @@ variable "enable" {
 variable "stack_name" {
   type        = string
   description = "The name of the stack to deploy the service to."
+  default     = "cctv"
 }
 variable "shm_size_mb" {
   default     = 256
diff --git a/products/mqtt/mqtt.tf b/products/mqtt/mqtt.tf
index 9a55f83..83aec59 100644
--- a/products/mqtt/mqtt.tf
+++ b/products/mqtt/mqtt.tf
@@ -15,5 +15,5 @@ module "service" {
     "mqtt_data" = "/mosquitto/data"
     "mqtt_logs" = "/mosquitto/logs"
   }
-  converge_enable = false
+  converge_enable = false # @todo Add healthcheck and enable this.
 }
diff --git a/products/mysql/mysql.tf b/products/mysql/mysql.tf
index e63bf22..48b8c82 100644
--- a/products/mysql/mysql.tf
+++ b/products/mysql/mysql.tf
@@ -19,6 +19,8 @@ module "service" {
   mounts                = local.mounts
   ports                 = var.ports
   placement_constraints = var.placement_constraints
+  parallelism           = 1
+  start_first           = false
 }
 locals {
   volumes = var.data_persist_path == null ? {
diff --git a/products/openhaystack/openhaystack.tf b/products/openhaystack/openhaystack.tf
index efe5226..ceb636e 100644
--- a/products/openhaystack/openhaystack.tf
+++ b/products/openhaystack/openhaystack.tf
@@ -18,10 +18,10 @@ module "anisette" {
 }
 module "macless-haystack" {
   source                = "../../docker/service"
+  image                 = "christld/macless-haystack"
   enable                = var.enable
   stack_name            = var.stack_name
   service_name          = "macless-haystack"
-  image                 = "christld/macless-haystack"
   networks              = concat(var.networks, [module.network])
   converge_enable       = false
   ports                 = [{ host = 6176, container = 6176, protocol = "tcp" }]
diff --git a/products/pgbackweb/outputs.tf b/products/pgbackweb/outputs.tf
index 4689c21..7be6bd8 100644
--- a/products/pgbackweb/outputs.tf
+++ b/products/pgbackweb/outputs.tf
@@ -6,4 +6,7 @@ output "postgres" {
 }
 output "network" {
   value = module.network.network
+}
+output "endpoint" {
+  value = module.pgbackweb.endpoint
 }
\ No newline at end of file
diff --git a/products/redis/redis.tf b/products/redis/redis.tf
index c386350..22fbb2d 100644
--- a/products/redis/redis.tf
+++ b/products/redis/redis.tf
@@ -39,9 +39,9 @@ module "service" {
   healthcheck              = ["CMD", "redis-cli", "ping"]
   healthcheck_interval     = "10s"
   healthcheck_start_period = "10s"
-  volumes = {
-    "data" = "/data",
-  }
-  ports                 = var.ports
-  placement_constraints = var.placement_constraints
+  volumes                  = { "data" = "/data", }
+  ports                    = var.ports
+  placement_constraints    = var.placement_constraints
+  parallelism              = 1
+  start_first              = false
 }
\ No newline at end of file
diff --git a/products/traefik/network.tf b/products/traefik/network.tf
index 064fa64..031e620 100644
--- a/products/traefik/network.tf
+++ b/products/traefik/network.tf
@@ -1,4 +1,8 @@
-module "traefik_network" {
+moved {
+  from = module.traefik_network
+  to   = module.network
+}
+module "network" {
   source       = "../../docker/network"
   stack_name   = var.stack_name
   network_name = "traefik"
diff --git a/products/traefik/outputs.tf b/products/traefik/outputs.tf
index e6ec39c..80bc27f 100644
--- a/products/traefik/outputs.tf
+++ b/products/traefik/outputs.tf
@@ -2,7 +2,7 @@ output "docker_service" {
   value = module.traefik.docker_service
 }
 output "docker_network" {
-  value = module.traefik_network
+  value = module.network
 }
 output "endpoint" {
   value = module.traefik.endpoint