ben/cluster-state
1
0
Fork 0
Code Issues 1 Pull requests Activity Actions

Compare commits

base: ben:c6b078cb2dcae7438d6f37c7d029ad10d29fb553
Branches Tags
ben:main
...
compare: ben:34ee9682d01d53670fb01c96d9128386808bf284
Branches Tags
ben:main

6 commits
c6b078cb2d ... 34ee9682d0

Author SHA1 Message Date
Ben Martin
34ee9682d0
chore(ollama): onboard to traefiks connect-enabled provider
All checks were successful
Lint / lint (push) Successful in 2m31s
Details
Terraform Plan and Apply / cicd (push) Successful in 1m52s
Details
2025-04-15 20:38:33 +00:00
Ben Martin
421abf5d5f
chore(media-centre): onboard to traefiks connect-enabled provider 2025-04-15 20:38:18 +00:00
Ben Martin
449105050a
chore(matrix): onboard to traefiks connect-enabled provider 2025-04-15 20:38:01 +00:00
Ben Martin
e80b0fe623
chore(keycloak): onboard to traefiks connect-enabled provider 2025-04-15 20:37:46 +00:00
Ben Martin
62f75ec67c
chore(jmc): onboard to traefiks connect-enabled provider 2025-04-15 20:32:11 +00:00
Ben Martin
0b3293d65e
chore(dummy): onboard to traefiks connect-enabled provider 2025-04-15 20:28:25 +00:00
6 changed files with 80 additions and 256 deletions
Download patch file Download diff file Expand all files Collapse all files

39
modules/dummy/jobspec.nomad.hcl
View file

@ -1,8 +1,15 @@
job "hello-world" {
datacenters = ["dc1"]
group "servers" {
count = 1
network {
mode = "bridge"
port "www" {
to = 8001
}
port "envoy_metrics" {
to = 9102
}
}
task "web" {
driver = "docker"
@ -25,20 +32,30 @@ job "hello-world" {
}
}
network {
mode = "bridge"
port "www" {
to = 8001
}
}
service {
port = "www"
port = 8001
provider = "consul"
connect {
sidecar_service {
proxy {
expose {
path {
path = "/metrics"
protocol = "http"
local_path_port = 9102
listener_port = "envoy_metrics"
}
}
transparent_proxy {}
}
}
}
tags = [
"traefik.enable=true",
"traefik.http.routers.web.rule=Host(`hello-world.brmartin.co.uk`)",
"traefik.consulcatalog.connect=true",
]
}
}

31
modules/jayne-martin-counselling/jobspec.nomad.hcl
View file

@ -50,41 +50,14 @@ job "jayne-martin-counselling" {
}
}
}
}
}
group "webserver-ingress-group" {
network {
mode = "bridge"
port "inbound" {
to = 8080
}
}
service {
port = "inbound"
tags = [
"traefik.enable=true",
"traefik.http.routers.jmc.rule=Host(`www.jaynemartincounselling.co.uk`)",
"traefik.http.routers.jmc.entrypoints=websecure"
"traefik.http.routers.jmc.entrypoints=websecure",
"traefik.consulcatalog.connect=true",
]
connect {
gateway {
ingress {
listener {
port = 8080
protocol = "http"
service {
name = "jayne-martin-counselling-webserver"
hosts = ["*"]
}
}
}
}
}
}
}
}

43
modules/keycloak/jobspec.nomad.hcl
View file

@ -38,6 +38,14 @@ job "keycloak" {
}
}
}
tags = [
"traefik.enable=true",
"traefik.http.routers.keycloak.rule=Host(`sso.brmartin.co.uk`)",
"traefik.http.routers.keycloak.entrypoints=websecure",
"traefik.consulcatalog.connect=true",
]
}
task "keycloak" {
@ -85,39 +93,4 @@ job "keycloak" {
"service.name" = "keycloak"
}
}
group "keycloak-ingress-group" {
network {
mode = "bridge"
port "inbound" {
to = 8080
}
}
service {
port = "inbound"
tags = [
"traefik.enable=true",
"traefik.http.routers.keycloak.rule=Host(`sso.brmartin.co.uk`)",
"traefik.http.routers.keycloak.entrypoints=websecure",
]
connect {
gateway {
ingress {
listener {
port = 8080
protocol = "http"
service {
name = "keycloak-keycloak"
hosts = ["*"]
}
}
}
}
}
}
}
}

149
modules/matrix/jobspec.nomad.hcl
View file

@ -51,6 +51,19 @@ job "matrix" {
}
}
}
tags = [
"traefik.enable=true",
"traefik.http.routers.synapse.rule=Host(`matrix.brmartin.co.uk`)",
"traefik.http.routers.synapse.entrypoints=websecure",
"traefik.http.routers.synapse.middlewares=synapseHeaders,synapseBuffering",
"traefik.http.middlewares.synapseHeaders.headers.accesscontrolallowmethods=GET,POST,PUT,DELETE,OPTIONS",
"traefik.http.middlewares.synapseHeaders.headers.accesscontrolallowheaders=Origin,X-Requested-With,Content-Type,Accept,Authorization",
"traefik.http.middlewares.synapseHeaders.headers.accesscontrolalloworiginlist=*",
"traefik.http.middlewares.synapseBuffering.buffering.maxRequestBodyBytes=1000000000",
"traefik.consulcatalog.connect=true",
]
}
task "synapse" {
@ -320,6 +333,14 @@ job "matrix" {
}
}
}
tags = [
"traefik.enable=true",
"traefik.http.routers.mas.rule=Host(`mas.brmartin.co.uk`) || (Host(`matrix.brmartin.co.uk`) && PathRegexp(`^/_matrix/client/(.*)/(login|logout|refresh)`))",
"traefik.http.routers.mas.entrypoints=websecure",
"traefik.consulcatalog.connect=true",
]
}
task "mas" {
@ -387,6 +408,17 @@ job "matrix" {
}
}
}
tags = [
"traefik.enable=true",
"traefik.http.routers.matrixWellKnown.rule=PathPrefix(`/.well-known/matrix`)",
"traefik.http.routers.matrixWellKnown.entrypoints=websecure",
"traefik.http.routers.matrixWellKnown.middlewares=matrixWellKnown",
"traefik.http.middlewares.matrixWellKnown.headers.accesscontrolalloworiginlist=*",
"traefik.consulcatalog.connect=true",
]
}
task "nginx" {
@ -463,123 +495,6 @@ job "matrix" {
}
}
group "synapse-ingress-group" {
network {
mode = "bridge"
port "inbound" {
to = 8080
}
}
service {
port = "inbound"
tags = [
"traefik.enable=true",
"traefik.http.routers.synapse.rule=Host(`matrix.brmartin.co.uk`)",
"traefik.http.routers.synapse.entrypoints=websecure",
"traefik.http.routers.synapse.middlewares=synapseHeaders,synapseBuffering",
"traefik.http.middlewares.synapseHeaders.headers.accesscontrolallowmethods=GET,POST,PUT,DELETE,OPTIONS",
"traefik.http.middlewares.synapseHeaders.headers.accesscontrolallowheaders=Origin,X-Requested-With,Content-Type,Accept,Authorization",
"traefik.http.middlewares.synapseHeaders.headers.accesscontrolalloworiginlist=*",
"traefik.http.middlewares.synapseBuffering.buffering.maxRequestBodyBytes=1000000000",
]
connect {
gateway {
proxy {
config {
local_idle_timeout_ms = 120000
}
}
ingress {
listener {
port = 8080
protocol = "http"
service {
name = "matrix-synapse"
hosts = ["*"]
}
}
}
}
}
}
}
group "mas-ingress-group" {
network {
mode = "bridge"
port "inbound" {
to = 8080
}
}
service {
port = "inbound"
tags = [
"traefik.enable=true",
"traefik.http.routers.mas.rule=Host(`mas.brmartin.co.uk`) || (Host(`matrix.brmartin.co.uk`) && PathRegexp(`^/_matrix/client/(.*)/(login|logout|refresh)`))",
"traefik.http.routers.mas.entrypoints=websecure",
]
connect {
gateway {
ingress {
listener {
port = 8080
protocol = "http"
service {
name = "matrix-mas"
hosts = ["*"]
}
}
}
}
}
}
}
group "wellknown-ingress-group" {
network {
mode = "bridge"
port "inbound" {
to = 8080
}
}
service {
port = "inbound"
tags = [
"traefik.enable=true",
"traefik.http.routers.matrixWellKnown.rule=PathPrefix(`/.well-known/matrix`)",
"traefik.http.routers.matrixWellKnown.entrypoints=websecure",
"traefik.http.routers.matrixWellKnown.middlewares=matrixWellKnown",
"traefik.http.middlewares.matrixWellKnown.headers.accesscontrolalloworiginlist=*",
]
connect {
gateway {
ingress {
listener {
port = 8080
protocol = "http"
service {
name = "matrix-nginx"
hosts = ["*"]
}
}
}
}
}
}
}
group "element" {
network {

43
modules/media-centre/jobspec.nomad.hcl
View file

@ -97,6 +97,14 @@ job "media-centre" {
}
}
}
tags = [
"traefik.enable=true",
"traefik.http.routers.plex.entrypoints=websecure",
"traefik.http.routers.plex.rule=Host(`plex.brmartin.co.uk`)",
"traefik.consulcatalog.connect=true",
]
}
network {
@ -152,39 +160,4 @@ job "media-centre" {
}
}
}
group "plex-ingress-group" {
network {
mode = "bridge"
port "inbound" {
to = 8080
}
}
service {
port = "inbound"
tags = [
"traefik.enable=true",
"traefik.http.routers.plex.entrypoints=websecure",
"traefik.http.routers.plex.rule=Host(`plex.brmartin.co.uk`)"
]
connect {
gateway {
ingress {
listener {
port = 8080
protocol = "http"
service {
name = "media-centre-plex"
hosts = ["*"]
}
}
}
}
}
}
}
}

31
modules/ollama/jobspec.nomad.hcl
View file

@ -133,41 +133,14 @@ job "ollama" {
}
}
}
}
}
group "open-webui-ingress-group" {
network {
mode = "bridge"
port "inbound" {
to = 8080
}
}
service {
port = "inbound"
tags = [
"traefik.enable=true",
"traefik.http.routers.openwebui.rule=Host(`eos.brmartin.co.uk`)",
"traefik.http.routers.openwebui.entrypoints=websecure"
"traefik.http.routers.openwebui.entrypoints=websecure",
"traefik.consulcatalog.connect=true",
]
connect {
gateway {
ingress {
listener {
port = 8080
protocol = "http"
service {
name = "ollama-open-webui"
hosts = ["*"]
}
}
}
}
}
}
}
}