Update Terraform null to v3.3.1

- traefik: TCP → HTTP check on /ping (enable ping entrypoint)
- gitea: check path → /api/healthz
- jellyfin: TCP → HTTP check on /health
- glance: TCP → HTTP check on /
- sonarr/prowlarr: check path / → /ping (×2 checks each)
- ntfy/transfer/deluge/openreader/authelia/pgadmin: add name and port to existing checks
- postgres: remove invalid TCP check (Connect-enabled service)
- unifi: TCP → script check via curl (macvlan host isolation workaround)

1-nixos-node/.terraform.lock.hcl

@@ -2,34 +2,34 @@
 # Manual edits may be lost in future updates.
 
 provider "registry.terraform.io/hashicorp/null" {
-  version     = "3.3.0"
+  version     = "3.3.1"
-  constraints = "3.3.0"
+  constraints = "3.3.1"
   hashes = [
-    "h1:4Zyprgl18zvgQ/jhrUIaqp0/OS/7VsqFonbyKkriRAg=",
+    "h1:4pjRixNj9/nijyC0jrCr8tYOpZ8afFwZ2M86y81PMa0=",
-    "h1:9EqpcVsMZvBdkGPH8/atDaMndAvEboc3hQ9pUngWtKA=",
+    "h1:6H++HbVhT9h31TNdGvlkW+2rjeWzgdjy98zqWpEJbgk=",
-    "h1:FmGyAkEcy7SywlZSfMieDpt2M01a+mNglQa2C5SX5cg=",
+    "h1:8fi/ACgBQzyw1gloPdzewHbGNeNCX1roaKHRYA1oJIM=",
-    "h1:Gq+xRK4yvwDpBJ2KFJkrmcNZikDiAEuFhAWeDtzanJc=",
+    "h1:EVks/Xyl9ffLEDraAp8RSsynzoVbTHOsof5n2niAsa0=",
-    "h1:J0wy2i0Bj2PSf7qs3cHfM+cioPmtJKeDQR4HHLTYy7E=",
+    "h1:GYp3g8OhJCT2nc0Nv5s8HPh9nsMydHbjyUh6P4sE+8w=",
-    "h1:TFDZkzTOusUXFYZq6UGPk2jpIwFpdNGrKqE0OzqCxzw=",
+    "h1:KWpBuTftQiLorSdw8QDMivKf6IhvVV0RzrdWSN53Qzs=",
-    "h1:a14TKo7Xvg4W8+H1VA6p+oLZTLxVQnYUD8LOaOs14A8=",
+    "h1:TuxJq10DVnRP7c5HBZPyyvQGcckNVfijyU1eXEu5e4M=",
-    "h1:guPnpcm8A04M+/oOdsBA//QWdmyhTvY7TzqYQdLvfwE=",
+    "h1:VMDxsLCSHpRC04bNeQw0JTvm5HhShID64QCSPvi9DRc=",
-    "h1:hntY8CxZwukx6VpUX9Bm00VSURuup9pL1Ss2M4NiUZA=",
+    "h1:c7EI8Sso93CiiAmD7P/53OOjAm5A7Q2+Z30aUTUFaEs=",
-    "h1:kncZNn+Pz/CbjPNyvvFogaXuYNQre69RN8CnApzY3ac=",
+    "h1:m5FqidbIgh+E9OigiZh8/xbkvpUQFSj3hZo/jqNLCLQ=",
-    "h1:l+dm3lhmu4ys7GbvIldfn544olSPH0DOiYruuFSfQkY=",
+    "h1:mV9WSUbshqmqPnhbOg198pgnjJQNnYixjXlovJBbl54=",
-    "h1:vIATsJo3I7W6bgsUEMUrs6dWPoHr8Eq6lkCQ3oOBdPI=",
+    "h1:oTK+zJCvllZur0nfzBZFGbflcZbvxnESJxepZprFRik=",
-    "zh:021748b5ea3b5f6956f2e75c42c5cdc113b391fb98ac71364a4965d23b37000f",
+    "zh:08c59776542ea16e5a8545752787b17ff412922182b4cfabe16139197be8ac44",
-    "zh:3b27956f8541d46704fda234e0d535c2ae2a4b33411848b1ee262a1ec03568b0",
+    "zh:123109cc7e5ed6d515787fbc212f2a3fd5e75647bb24ab7c801ccd4d4ed42451",
-    "zh:3de4ed47d6d0f4d8edba4a5092c7c9799950eda63989d8d0d2586e6afcb0aa20",
+    "zh:14b3fa4372754b54844b41d5dbd4671a292d8d6828b90169061feb4d7b15dd05",
-    "zh:57ed8935c7d56dbc91cf2673534582cacfaab7a2f105f51d9f797e99df0c0c47",
+    "zh:56a4daaa3212f57b764bf3d1f333141c6610c5f21abb240e0111221f7c7fa4d4",
-    "zh:58e176ba1d142827089e30e0711e007309a9f2726e8881986da5026e9778fdf4",
-    "zh:5949c4a3d4a93f841f155cdb7e991c087e637145c1630572e21948224f8f4923",
-    "zh:76d60f366b743003c1b085afa769b45b2198ee919927e45807d7d44fb42c067d",
     "zh:78d5eefdd9e494defcb3c68d282b8f96630502cac21d1ea161f53cfe9bb483b3",
-    "zh:79cd1bab1261a07f84e917191d7ddc4340ac5f5524283767256f7ffd7f87caf0",
+    "zh:7e888a026dbacd2474a42264227ae35f639780f0f0c613529d10a95cd61988b3",
-    "zh:8ec9083038cf710b30e319eaa467c9df7fa52bbd9969b61053a35bc2cdd2e0a6",
+    "zh:85a53646267e87d600df7124e4767ffde9bba3b6356d45d961618bdd68131cc7",
-    "zh:a6e502cb579685ab7aeb886c2bb11ddd9cfed74b41008592d57cbc3351a9218b",
+    "zh:8ffa0e9c7c39b2ab0905b472465d6e35ef0b776b3f6273bb34c150340b61bff1",
-    "zh:acb74d6b4f66ff6acfcda315df802a7432170ef3955c9b432cb4580767004006",
+    "zh:9846510a1841530d4403f4818e233f91e3b3bade7441047599fbf800742f65be",
-    "zh:f0ce55d8d9ffdb33dab612b1246f9bab060a9d54fc32ce2b4a038646155660af",
+    "zh:afa98d44860875f037c6def0a7e6ff208e042712ba771f620482b143cd336891",
+    "zh:bdca130d9ef27488ae0b13bc8fd8019e8bbdd4f2ceff29da066bd333165d68c5",
+    "zh:cb3b94cbca88210dd0d1f11e2b8a89333f48c3857faf8f70f589072ce7c28610",
+    "zh:f0c0ba87925fe32f84b80f7513b1efb1b0866f51f899ba825e95ad59ff09b018",
   ]
 }
 

1-nixos-node/node.tf

@@ -2,7 +2,7 @@ terraform {
   required_providers {
     null = {
       source  = "hashicorp/null"
-      version = "3.3.0"
+      version = "3.3.1"
     }
     template = {
       source  = "hashicorp/template"

2-nomad-config/1-data/pgadmin.nomad.hcl

@@ -58,8 +58,10 @@ job "pgadmin" {
         ]
 
         check {
+          name     = "alive"
           type     = "http"
           path     = "/"
+          port     = "http"
           interval = "10s"
           timeout  = "2s"
         }

2-nomad-config/1-data/postgres.nomad.hcl

@@ -7,6 +7,10 @@ job "postgres" {
       connect {
         sidecar_service {}
       }
+
+      # Note: TCP checks are not valid for Connect-enabled services (runs through
+      # Envoy sidecar). Postgres is a single-writer DB that we never canary, so
+      # observable health via Consul is lower priority than other services.
     }
 
     task "postgres" {

2-nomad-config/2-ingress/authelia.nomad.hcl

@@ -33,8 +33,10 @@ job "authelia" {
       }
 
       check {
+        name     = "alive"
         type     = "http"
         path     = "/health"
+        port     = "http"
         interval = "10s"
         timeout  = "2s"
       }

2-nomad-config/2-ingress/traefik.nomad.hcl

@@ -35,7 +35,8 @@ job "traefik" {
 
       check {
         name     = "alive"
-        type     = "tcp"
+        type     = "http"
+        path     = "/ping"
         port     = "api"
         interval = "10s"
         timeout  = "2s"
@@ -85,6 +86,9 @@ api:
   dashboard: true
   insecure: true
 
+ping:
+  entryPoint: traefik
+
 providers:
   file:
     directory: "/etc/traefik/configs/"

2-nomad-config/deluge.nomad.hcl

@@ -54,8 +54,10 @@ EOH
       ]
 
       check {
+        name     = "alive"
         type     = "http"
         path     = "/"
+        port     = "http"
         interval = "10s"
         timeout  = "2s"
       }
@@ -78,8 +80,10 @@ EOH
       }
 
       check {
+        name     = "alive"
         type     = "http"
         path     = "/"
+        port     = "http"
         interval = "10s"
         timeout  = "2s"
       }

2-nomad-config/gitea.nomad.hcl

@@ -32,8 +32,10 @@ job "gitea" {
       ]
 
       check {
+        name     = "alive"
         type     = "http"
-        path     = "/"
+        path     = "/api/healthz"
+        port     = "http"
         interval = "10s"
         timeout  = "2s"
       }

2-nomad-config/glance.nomad.hcl

@@ -12,7 +12,7 @@ job "glance" {
       driver = "docker"
 
       config {
-        image = "glanceapp/glance:latest"
+        image = "glanceapp/glance:v0.7.8"
         ports = ["http"]
         volumes = [
           "local/glance.yml:/app/config/glance.yml",
@@ -30,7 +30,8 @@ job "glance" {
 
         check {
           name     = "alive"
-          type     = "tcp"
+          type     = "http"
+          path     = "/"
           port     = "http"
           interval = "10s"
           timeout  = "2s"

2-nomad-config/jellyfin.nomad.hcl

@@ -28,10 +28,11 @@ job "jellyfin" {
 
         check {
           name     = "alive"
-          type     = "tcp"
+          type     = "http"
+          path     = "/health"
           port     = "http"
           interval = "10s"
-          timeout  = "2s"
+          timeout  = "5s"
         }
       }
 

2-nomad-config/ntfy.nomad.hcl

@@ -33,8 +33,10 @@ job "ntfy" {
       ]
 
       check {
+        name     = "alive"
         type     = "http"
         path     = "/healthz"
+        port     = "http"
         interval = "10s"
         timeout  = "2s"
       }

2-nomad-config/openreader.nomad.hcl

@@ -31,8 +31,10 @@ job "openreader" {
       ]
 
       check {
+        name     = "alive"
         type     = "http"
         path     = "/"
+        port     = "http"
         interval = "10s"
         timeout  = "2s"
       }
@@ -48,8 +50,10 @@ job "openreader" {
       }
 
       check {
+        name     = "alive"
         type     = "http"
         path     = "/"
+        port     = "http"
         interval = "10s"
         timeout  = "2s"
       }

2-nomad-config/prowlarr.nomad.hcl

@@ -34,8 +34,9 @@ job "prowlarr" {
       ]
 
       check {
+        name     = "alive"
         type     = "http"
-        path     = "/"
+        path     = "/ping"
         interval = "10s"
         timeout  = "2s"
       }
@@ -51,8 +52,9 @@ job "prowlarr" {
       }
 
       check {
+        name     = "alive"
         type     = "http"
-        path     = "/"
+        path     = "/ping"
         interval = "10s"
         timeout  = "2s"
       }

2-nomad-config/sonarr.nomad.hcl

@@ -37,8 +37,9 @@ job "sonarr" {
       ]
 
       check {
+        name     = "alive"
         type     = "http"
-        path     = "/"
+        path     = "/ping"
         interval = "10s"
         timeout  = "2s"
       }
@@ -54,8 +55,9 @@ job "sonarr" {
       }
 
       check {
+        name     = "alive"
         type     = "http"
-        path     = "/"
+        path     = "/ping"
         interval = "10s"
         timeout  = "2s"
       }

2-nomad-config/transfer.nomad.hcl

@@ -16,8 +16,10 @@ job "transfer" {
       ]
 
       check {
+        name     = "alive"
         type     = "http"
         path     = "/"
+        port     = "http"
         interval = "10s"
         timeout  = "2s"
       }

2-nomad-config/unifi.nomad.hcl

@@ -21,6 +21,26 @@ job "unifi-network" {
         UNIFI_STDOUT       = "true"
       }
 
+      # Register in Consul so Traefik and health checks can find it.
+      # address_mode=driver uses the macvlan IP (192.168.1.50) rather than the host IP.
+      service {
+        name         = "unifi-network"
+        port         = 8443
+        address_mode = "driver"
+
+        # TCP/HTTP checks from the Consul agent can't reach the macvlan IP (host↔macvlan
+        # isolation). Use a script check instead — it runs inside the container via
+        # docker exec and connects to localhost:8443 directly.
+        check {
+          name     = "alive"
+          type     = "script"
+          command  = "/usr/bin/curl"
+          args     = ["-sk", "--max-time", "5", "-o", "/dev/null", "https://localhost:8443"]
+          interval = "30s"
+          timeout  = "10s"
+        }
+      }
+
       volume_mount {
         volume      = "unraid_appdata_unifi_network"
         destination = "/unifi" # Expected root directory (contains data, log, cert subdirs)

cicd-plan.md

@@ -188,8 +188,8 @@ Most jobs already have Consul health checks — these can use `health_check = "c
 | frigate    | ✅            | ✅ `single-node-writer` | ⚠️ same — rolling                                                                 |
 | glance     | ✅            | no                      | ✅ yes                                                                            |
 | transfer   | ✅            | ✅ `single-node-writer` | ⚠️ rolling                                                                        |
-| openreader | ❌            | ✅ `single-node-writer` | ⚠️ add check first, then rolling                                                  |
+| openreader | ✅ `/`        | ✅ `single-node-writer` | ⚠️ rolling                                                                        |
-| unifi      | ❌            | ✅ `single-node-writer` | ⚠️ add check first, then rolling                                                  |
+| unifi      | ✅ script     | ✅ `single-node-writer` | ⚠️ rolling                                                                        |
 | traefik    | (ingress)     | ✅                      | ⚠️ rolling — downtime risk, promote quickly                                       |
 | authelia   | (ingress)     | ✅                      | ✅ stateless config, canary fine                                                  |
 | renovate   | batch job     | n/a                     | n/a — no deployment model                                                         |
@@ -298,8 +298,8 @@ exit 1
 - [x] **Phase 1c**: Add Nomad validate step — add `NOMAD_ADDR` + read-only `NOMAD_TOKEN` to Gitea secrets
 - [x] **Phase 2**: Add image pull validation step to the workflow
 - [ ] **Phase 3a**: Add `update` stanzas to ntfy and glance (simplest, no volume conflict)
-- [ ] **Phase 3b**: Add rolling `update` stanzas to remaining service jobs (jellyfin, sonarr, etc.)
+- [ ] **Phase 3b**: Add rolling `update` stanzas to remaining service jobs (jellyfin, sonarr, prowlarr, deluge, gitea, immich, transfer, frigate, openreader, unifi, authelia, traefik)
-- [ ] **Phase 3c**: Add health checks to openreader and unifi before adding update stanzas
+- [x] **Phase 3c**: Add health checks to openreader and unifi before adding update stanzas
 - [ ] **Phase 4a**: Add on-push workflow that runs `terraform apply -auto-approve` using full credential set
 - [ ] **Phase 4b**: Add deployment promotion/revert polling script
 - [ ] **Phase 4c**: Wire ntfy notifications for promote/revert outcomes