Compare commits
1 Commits
bf0a008b94
...
main
| Author | SHA1 | Date | |
|---|---|---|---|
| e695485353 |
40
1-nixos-node/.terraform.lock.hcl
generated
40
1-nixos-node/.terraform.lock.hcl
generated
@@ -2,34 +2,22 @@
|
|||||||
# Manual edits may be lost in future updates.
|
# Manual edits may be lost in future updates.
|
||||||
|
|
||||||
provider "registry.terraform.io/hashicorp/null" {
|
provider "registry.terraform.io/hashicorp/null" {
|
||||||
version = "3.3.0"
|
version = "3.2.1"
|
||||||
constraints = "3.3.0"
|
constraints = "3.2.1"
|
||||||
hashes = [
|
hashes = [
|
||||||
"h1:4Zyprgl18zvgQ/jhrUIaqp0/OS/7VsqFonbyKkriRAg=",
|
"h1:FbGfc+muBsC17Ohy5g806iuI1hQc4SIexpYCrQHQd8w=",
|
||||||
"h1:9EqpcVsMZvBdkGPH8/atDaMndAvEboc3hQ9pUngWtKA=",
|
"zh:58ed64389620cc7b82f01332e27723856422820cfd302e304b5f6c3436fb9840",
|
||||||
"h1:FmGyAkEcy7SywlZSfMieDpt2M01a+mNglQa2C5SX5cg=",
|
"zh:62a5cc82c3b2ddef7ef3a6f2fedb7b9b3deff4ab7b414938b08e51d6e8be87cb",
|
||||||
"h1:Gq+xRK4yvwDpBJ2KFJkrmcNZikDiAEuFhAWeDtzanJc=",
|
"zh:63cff4de03af983175a7e37e52d4bd89d990be256b16b5c7f919aff5ad485aa5",
|
||||||
"h1:J0wy2i0Bj2PSf7qs3cHfM+cioPmtJKeDQR4HHLTYy7E=",
|
"zh:74cb22c6700e48486b7cabefa10b33b801dfcab56f1a6ac9b6624531f3d36ea3",
|
||||||
"h1:TFDZkzTOusUXFYZq6UGPk2jpIwFpdNGrKqE0OzqCxzw=",
|
|
||||||
"h1:a14TKo7Xvg4W8+H1VA6p+oLZTLxVQnYUD8LOaOs14A8=",
|
|
||||||
"h1:guPnpcm8A04M+/oOdsBA//QWdmyhTvY7TzqYQdLvfwE=",
|
|
||||||
"h1:hntY8CxZwukx6VpUX9Bm00VSURuup9pL1Ss2M4NiUZA=",
|
|
||||||
"h1:kncZNn+Pz/CbjPNyvvFogaXuYNQre69RN8CnApzY3ac=",
|
|
||||||
"h1:l+dm3lhmu4ys7GbvIldfn544olSPH0DOiYruuFSfQkY=",
|
|
||||||
"h1:vIATsJo3I7W6bgsUEMUrs6dWPoHr8Eq6lkCQ3oOBdPI=",
|
|
||||||
"zh:021748b5ea3b5f6956f2e75c42c5cdc113b391fb98ac71364a4965d23b37000f",
|
|
||||||
"zh:3b27956f8541d46704fda234e0d535c2ae2a4b33411848b1ee262a1ec03568b0",
|
|
||||||
"zh:3de4ed47d6d0f4d8edba4a5092c7c9799950eda63989d8d0d2586e6afcb0aa20",
|
|
||||||
"zh:57ed8935c7d56dbc91cf2673534582cacfaab7a2f105f51d9f797e99df0c0c47",
|
|
||||||
"zh:58e176ba1d142827089e30e0711e007309a9f2726e8881986da5026e9778fdf4",
|
|
||||||
"zh:5949c4a3d4a93f841f155cdb7e991c087e637145c1630572e21948224f8f4923",
|
|
||||||
"zh:76d60f366b743003c1b085afa769b45b2198ee919927e45807d7d44fb42c067d",
|
|
||||||
"zh:78d5eefdd9e494defcb3c68d282b8f96630502cac21d1ea161f53cfe9bb483b3",
|
"zh:78d5eefdd9e494defcb3c68d282b8f96630502cac21d1ea161f53cfe9bb483b3",
|
||||||
"zh:79cd1bab1261a07f84e917191d7ddc4340ac5f5524283767256f7ffd7f87caf0",
|
"zh:79e553aff77f1cfa9012a2218b8238dd672ea5e1b2924775ac9ac24d2a75c238",
|
||||||
"zh:8ec9083038cf710b30e319eaa467c9df7fa52bbd9969b61053a35bc2cdd2e0a6",
|
"zh:a1e06ddda0b5ac48f7e7c7d59e1ab5a4073bbcf876c73c0299e4610ed53859dc",
|
||||||
"zh:a6e502cb579685ab7aeb886c2bb11ddd9cfed74b41008592d57cbc3351a9218b",
|
"zh:c37a97090f1a82222925d45d84483b2aa702ef7ab66532af6cbcfb567818b970",
|
||||||
"zh:acb74d6b4f66ff6acfcda315df802a7432170ef3955c9b432cb4580767004006",
|
"zh:e4453fbebf90c53ca3323a92e7ca0f9961427d2f0ce0d2b65523cc04d5d999c2",
|
||||||
"zh:f0ce55d8d9ffdb33dab612b1246f9bab060a9d54fc32ce2b4a038646155660af",
|
"zh:e80a746921946d8b6761e77305b752ad188da60688cfd2059322875d363be5f5",
|
||||||
|
"zh:fbdb892d9822ed0e4cb60f2fedbdbb556e4da0d88d3b942ae963ed6ff091e48f",
|
||||||
|
"zh:fca01a623d90d0cad0843102f9b8b9fe0d3ff8244593bd817f126582b52dd694",
|
||||||
]
|
]
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -2,7 +2,7 @@ terraform {
|
|||||||
required_providers {
|
required_providers {
|
||||||
null = {
|
null = {
|
||||||
source = "hashicorp/null"
|
source = "hashicorp/null"
|
||||||
version = "3.3.0"
|
version = "3.2.1"
|
||||||
}
|
}
|
||||||
template = {
|
template = {
|
||||||
source = "hashicorp/template"
|
source = "hashicorp/template"
|
||||||
|
|||||||
@@ -58,8 +58,10 @@ job "pgadmin" {
|
|||||||
]
|
]
|
||||||
|
|
||||||
check {
|
check {
|
||||||
|
name = "alive"
|
||||||
type = "http"
|
type = "http"
|
||||||
path = "/"
|
path = "/"
|
||||||
|
port = "http"
|
||||||
interval = "10s"
|
interval = "10s"
|
||||||
timeout = "2s"
|
timeout = "2s"
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -7,6 +7,10 @@ job "postgres" {
|
|||||||
connect {
|
connect {
|
||||||
sidecar_service {}
|
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" {
|
task "postgres" {
|
||||||
|
|||||||
@@ -33,8 +33,10 @@ job "authelia" {
|
|||||||
}
|
}
|
||||||
|
|
||||||
check {
|
check {
|
||||||
|
name = "alive"
|
||||||
type = "http"
|
type = "http"
|
||||||
path = "/health"
|
path = "/health"
|
||||||
|
port = "http"
|
||||||
interval = "10s"
|
interval = "10s"
|
||||||
timeout = "2s"
|
timeout = "2s"
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -35,7 +35,8 @@ job "traefik" {
|
|||||||
|
|
||||||
check {
|
check {
|
||||||
name = "alive"
|
name = "alive"
|
||||||
type = "tcp"
|
type = "http"
|
||||||
|
path = "/ping"
|
||||||
port = "api"
|
port = "api"
|
||||||
interval = "10s"
|
interval = "10s"
|
||||||
timeout = "2s"
|
timeout = "2s"
|
||||||
@@ -85,6 +86,9 @@ api:
|
|||||||
dashboard: true
|
dashboard: true
|
||||||
insecure: true
|
insecure: true
|
||||||
|
|
||||||
|
ping:
|
||||||
|
entryPoint: traefik
|
||||||
|
|
||||||
providers:
|
providers:
|
||||||
file:
|
file:
|
||||||
directory: "/etc/traefik/configs/"
|
directory: "/etc/traefik/configs/"
|
||||||
|
|||||||
@@ -54,8 +54,10 @@ EOH
|
|||||||
]
|
]
|
||||||
|
|
||||||
check {
|
check {
|
||||||
|
name = "alive"
|
||||||
type = "http"
|
type = "http"
|
||||||
path = "/"
|
path = "/"
|
||||||
|
port = "http"
|
||||||
interval = "10s"
|
interval = "10s"
|
||||||
timeout = "2s"
|
timeout = "2s"
|
||||||
}
|
}
|
||||||
@@ -78,8 +80,10 @@ EOH
|
|||||||
}
|
}
|
||||||
|
|
||||||
check {
|
check {
|
||||||
|
name = "alive"
|
||||||
type = "http"
|
type = "http"
|
||||||
path = "/"
|
path = "/"
|
||||||
|
port = "http"
|
||||||
interval = "10s"
|
interval = "10s"
|
||||||
timeout = "2s"
|
timeout = "2s"
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -32,8 +32,10 @@ job "gitea" {
|
|||||||
]
|
]
|
||||||
|
|
||||||
check {
|
check {
|
||||||
|
name = "alive"
|
||||||
type = "http"
|
type = "http"
|
||||||
path = "/"
|
path = "/api/healthz"
|
||||||
|
port = "http"
|
||||||
interval = "10s"
|
interval = "10s"
|
||||||
timeout = "2s"
|
timeout = "2s"
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -12,7 +12,7 @@ job "glance" {
|
|||||||
driver = "docker"
|
driver = "docker"
|
||||||
|
|
||||||
config {
|
config {
|
||||||
image = "glanceapp/glance:latest"
|
image = "glanceapp/glance:v0.7.8"
|
||||||
ports = ["http"]
|
ports = ["http"]
|
||||||
volumes = [
|
volumes = [
|
||||||
"local/glance.yml:/app/config/glance.yml",
|
"local/glance.yml:/app/config/glance.yml",
|
||||||
@@ -30,7 +30,8 @@ job "glance" {
|
|||||||
|
|
||||||
check {
|
check {
|
||||||
name = "alive"
|
name = "alive"
|
||||||
type = "tcp"
|
type = "http"
|
||||||
|
path = "/"
|
||||||
port = "http"
|
port = "http"
|
||||||
interval = "10s"
|
interval = "10s"
|
||||||
timeout = "2s"
|
timeout = "2s"
|
||||||
|
|||||||
@@ -28,10 +28,11 @@ job "jellyfin" {
|
|||||||
|
|
||||||
check {
|
check {
|
||||||
name = "alive"
|
name = "alive"
|
||||||
type = "tcp"
|
type = "http"
|
||||||
|
path = "/health"
|
||||||
port = "http"
|
port = "http"
|
||||||
interval = "10s"
|
interval = "10s"
|
||||||
timeout = "2s"
|
timeout = "5s"
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -33,8 +33,10 @@ job "ntfy" {
|
|||||||
]
|
]
|
||||||
|
|
||||||
check {
|
check {
|
||||||
|
name = "alive"
|
||||||
type = "http"
|
type = "http"
|
||||||
path = "/healthz"
|
path = "/healthz"
|
||||||
|
port = "http"
|
||||||
interval = "10s"
|
interval = "10s"
|
||||||
timeout = "2s"
|
timeout = "2s"
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -31,8 +31,10 @@ job "openreader" {
|
|||||||
]
|
]
|
||||||
|
|
||||||
check {
|
check {
|
||||||
|
name = "alive"
|
||||||
type = "http"
|
type = "http"
|
||||||
path = "/"
|
path = "/"
|
||||||
|
port = "http"
|
||||||
interval = "10s"
|
interval = "10s"
|
||||||
timeout = "2s"
|
timeout = "2s"
|
||||||
}
|
}
|
||||||
@@ -48,8 +50,10 @@ job "openreader" {
|
|||||||
}
|
}
|
||||||
|
|
||||||
check {
|
check {
|
||||||
|
name = "alive"
|
||||||
type = "http"
|
type = "http"
|
||||||
path = "/"
|
path = "/"
|
||||||
|
port = "http"
|
||||||
interval = "10s"
|
interval = "10s"
|
||||||
timeout = "2s"
|
timeout = "2s"
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -34,8 +34,9 @@ job "prowlarr" {
|
|||||||
]
|
]
|
||||||
|
|
||||||
check {
|
check {
|
||||||
|
name = "alive"
|
||||||
type = "http"
|
type = "http"
|
||||||
path = "/"
|
path = "/ping"
|
||||||
interval = "10s"
|
interval = "10s"
|
||||||
timeout = "2s"
|
timeout = "2s"
|
||||||
}
|
}
|
||||||
@@ -51,8 +52,9 @@ job "prowlarr" {
|
|||||||
}
|
}
|
||||||
|
|
||||||
check {
|
check {
|
||||||
|
name = "alive"
|
||||||
type = "http"
|
type = "http"
|
||||||
path = "/"
|
path = "/ping"
|
||||||
interval = "10s"
|
interval = "10s"
|
||||||
timeout = "2s"
|
timeout = "2s"
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -37,8 +37,9 @@ job "sonarr" {
|
|||||||
]
|
]
|
||||||
|
|
||||||
check {
|
check {
|
||||||
|
name = "alive"
|
||||||
type = "http"
|
type = "http"
|
||||||
path = "/"
|
path = "/ping"
|
||||||
interval = "10s"
|
interval = "10s"
|
||||||
timeout = "2s"
|
timeout = "2s"
|
||||||
}
|
}
|
||||||
@@ -54,8 +55,9 @@ job "sonarr" {
|
|||||||
}
|
}
|
||||||
|
|
||||||
check {
|
check {
|
||||||
|
name = "alive"
|
||||||
type = "http"
|
type = "http"
|
||||||
path = "/"
|
path = "/ping"
|
||||||
interval = "10s"
|
interval = "10s"
|
||||||
timeout = "2s"
|
timeout = "2s"
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -16,8 +16,10 @@ job "transfer" {
|
|||||||
]
|
]
|
||||||
|
|
||||||
check {
|
check {
|
||||||
|
name = "alive"
|
||||||
type = "http"
|
type = "http"
|
||||||
path = "/"
|
path = "/"
|
||||||
|
port = "http"
|
||||||
interval = "10s"
|
interval = "10s"
|
||||||
timeout = "2s"
|
timeout = "2s"
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -21,6 +21,26 @@ job "unifi-network" {
|
|||||||
UNIFI_STDOUT = "true"
|
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_mount {
|
||||||
volume = "unraid_appdata_unifi_network"
|
volume = "unraid_appdata_unifi_network"
|
||||||
destination = "/unifi" # Expected root directory (contains data, log, cert subdirs)
|
destination = "/unifi" # Expected root directory (contains data, log, cert subdirs)
|
||||||
|
|||||||
@@ -188,8 +188,8 @@ Most jobs already have Consul health checks — these can use `health_check = "c
|
|||||||
| frigate | ✅ | ✅ `single-node-writer` | ⚠️ same — rolling |
|
| frigate | ✅ | ✅ `single-node-writer` | ⚠️ same — rolling |
|
||||||
| glance | ✅ | no | ✅ yes |
|
| glance | ✅ | no | ✅ yes |
|
||||||
| transfer | ✅ | ✅ `single-node-writer` | ⚠️ rolling |
|
| 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 |
|
| traefik | (ingress) | ✅ | ⚠️ rolling — downtime risk, promote quickly |
|
||||||
| authelia | (ingress) | ✅ | ✅ stateless config, canary fine |
|
| authelia | (ingress) | ✅ | ✅ stateless config, canary fine |
|
||||||
| renovate | batch job | n/a | n/a — no deployment model |
|
| 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 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
|
- [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 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 4a**: Add on-push workflow that runs `terraform apply -auto-approve` using full credential set
|
||||||
- [ ] **Phase 4b**: Add deployment promotion/revert polling script
|
- [ ] **Phase 4b**: Add deployment promotion/revert polling script
|
||||||
- [ ] **Phase 4c**: Wire ntfy notifications for promote/revert outcomes
|
- [ ] **Phase 4c**: Wire ntfy notifications for promote/revert outcomes
|
||||||
|
|||||||
Reference in New Issue
Block a user