General fixup

products/docker_registry/janitor.tf

@@ -4,7 +4,7 @@ module "docker_registry_janitor" {
   stack_name   = var.stack_name
   service_name = "janitor"
   image        = "registry:2"
-  command = ["registry", "garbage-collect", "/etc/docker/registry/config.yml", "--delete-untagged"]
+  command      = ["registry", "garbage-collect", "/etc/docker/registry/config.yml", "--delete-untagged"]
   configs = {
     "/etc/docker/registry/config.yml" = yamlencode(local.registry_config_yaml)
     "/etc/docker/registry/htpasswd"   = local.registry_htpasswd
@@ -13,4 +13,5 @@ module "docker_registry_janitor" {
   restart_delay         = "6h"
   placement_constraints = var.placement_constraints
   networks              = [module.registry_network]
+  converge_enable       = false
 }

products/forgejo/forgejo/forgejo.tf

@@ -39,5 +39,5 @@ module "forgejo" {
       container = 3000
     },
   ]
-  traefik = var.traefik
+  traefik = merge( var.traefik, {port = 3000})
 }

products/pgbackweb/pgbackweb.tf

@@ -17,7 +17,7 @@ module "pgbackweb" {
   service_name          = var.service_name
   networks              = concat([module.network], var.networks)
   placement_constraints = var.placement_constraints
-  traefik               = merge(var.traefik,{ port = 8085 })
+  traefik               = merge(var.traefik, { port = 8085 })
 }
 module "postgres" {
   source                = "../postgres"

products/smokeping/inputs.tf

@@ -7,7 +7,9 @@ variable "traefik" {
   default = null
   type = object({
     domain = string
-    port   = optional(number, 80)
+    port   = optional(number)
+    ssl    = optional(bool, false)
+    rule   = optional(string)
   })
   description = "Whether to enable traefik for the service."
 }

products/statping/inputs.tf

@@ -49,7 +49,9 @@ variable "traefik" {
   default = null
   type = object({
     domain = string
-    port   = optional(number, 8080)
+    port   = optional(number)
+    ssl    = optional(bool, false)
+    rule   = optional(string)
   })
   description = "Whether to enable traefik for the service."
 }

products/traefik/traefik.tf

@@ -63,6 +63,7 @@ module "traefik" {
   traefik = var.traefik_service_domain != null ? {
     domain = var.traefik_service_domain
     port   = var.dashboard_port
+    ssl    = var.enable_ssl
   } : null
   ports = [
     {