nomad
/
unifi
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Adapt service to job_name

This commit is contained in:
Daniel Berteaud 2023-09-03 23:08:20 +02:00
parent e78b09f51c
commit e3d367619b
3 changed files with 15 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
deps/common vendored

@ -1 +1 @@
Subproject commit a1738a81645748892a34d990c6df07cd1b4815ad
Subproject commit 026777bd644b84396138f1c3e940c93d1f78b563

1
prep.d/mv_conf.sh Executable file
View File

@ -0,0 +1 @@
[[ template "common/mv_conf.sh.tpl" dict "ctx" . "services" (dict "unifi" .unifi.job_name) ]]

26
unifi.nomad.hcl
View File

@ -12,7 +12,7 @@ job [[ .unifi.job_name | toJSON ]] {
}
service {
name = "unifi[[ .env.suffix ]]"
name = "[[ .unifi.job_name ]][[ .env.suffix ]]"
port = 8888
[[ template "common/connect.tpl" dict "ctx" . "config" .unifi.controller ]]
@ -21,23 +21,23 @@ job [[ .unifi.job_name | toJSON ]] {
"[[ .traefik.instance ]].enable=true",
# Note : no Host as inform requests are sent without. But it's binded to the dedicated entrypoint anyway
"[[ .traefik.instance ]].http.routers.unifi-inform[[ .env.suffix ]].rule=(Path(`/inform`) && Method(`POST`)) || (PathPrefix(`/dl/firmware-cached`) && (Method(`GET`) || Method(`HEAD`)))",
"[[ .traefik.instance ]].http.routers.unifi-inform[[ .env.suffix ]].entrypoints=[[ join (merge .unifi.inform.traefik .traefik).entrypoints "," ]]",
"[[ .traefik.instance ]].http.routers.unifi-inform[[ .env.suffix ]].middlewares=[[ template "common/traefik_middlewares.tpl" merge .unifi.inform.traefik .traefik ]]",
"[[ .traefik.instance ]].http.routers[[ .unifi.job_name ]]-inform[[ .env.suffix ]].rule=(Path(`/inform`) && Method(`POST`)) || (PathPrefix(`/dl/firmware-cached`) && (Method(`GET`) || Method(`HEAD`)))",
"[[ .traefik.instance ]].http.routers[[ .unifi.job_name ]]-inform[[ .env.suffix ]].entrypoints=[[ join (merge .unifi.inform.traefik .traefik).entrypoints "," ]]",
"[[ .traefik.instance ]].http.routers[[ .unifi.job_name ]]-inform[[ .env.suffix ]].middlewares=[[ template "common/traefik_middlewares.tpl" merge .unifi.inform.traefik .traefik ]]",
"[[ .traefik.instance ]].http.routers.unifi-controller[[ .env.suffix ]].rule=Host(`
"[[ .traefik.instance ]].http.routers[[ .unifi.job_name ]]-controller[[ .env.suffix ]].rule=Host(`
[[- (urlParse .unifi.controller.public_url).Hostname -]]`)
[[- if ne "" (urlParse .unifi.controller.public_url).Path ]] && PathPrefix(`[[ (urlParse .unifi.controller.public_url).Path ]]`)[[ end ]]",
"[[ .traefik.instance ]].http.routers.unifi-controller[[ .env.suffix ]].entrypoints=[[ join (merge .unifi.controller.traefik .traefik).entrypoints "," ]]",
"[[ .traefik.instance ]].http.routers.unifi-controller[[ .env.suffix ]].tls=true",
"[[ .traefik.instance ]].http.routers.unifi-controller[[ .env.suffix ]].middlewares=[[ template "common/traefik_middlewares.tpl" merge .unifi.controller.traefik .traefik ]]",
"[[ .traefik.instance ]].http.routers[[ .unifi.job_name ]]-controller[[ .env.suffix ]].entrypoints=[[ join (merge .unifi.controller.traefik .traefik).entrypoints "," ]]",
"[[ .traefik.instance ]].http.routers[[ .unifi.job_name ]]-controller[[ .env.suffix ]].tls=true",
"[[ .traefik.instance ]].http.routers[[ .unifi.job_name ]]-controller[[ .env.suffix ]].middlewares=[[ template "common/traefik_middlewares.tpl" merge .unifi.controller.traefik .traefik ]]",
"[[ .traefik.instance ]].http.routers.unifi-portal[[ .env.suffix ]].rule=Host(`
"[[ .traefik.instance ]].http.routers[[ .unifi.job_name ]]-portal[[ .env.suffix ]].rule=Host(`
[[- (urlParse .unifi.guest_portal.public_url).Hostname -]]
`) && PathPrefix(`/guest`)",
"[[ .traefik.instance ]].http.routers.unifi-portal[[ .env.suffix ]].entrypoints=[[ join (merge .unifi.guest_portal.traefik .traefik).entrypoints "," ]]",
"[[ .traefik.instance ]].http.routers.unifi-portal[[ .env.suffix ]].tls=true",
"[[ .traefik.instance ]].http.routers.unifi-portal[[ .env.suffix ]].middlewares=[[ template "common/traefik_middlewares.tpl" merge .unifi.guest_portal.traefik .traefik ]]"
"[[ .traefik.instance ]].http.routers[[ .unifi.job_name ]]-portal[[ .env.suffix ]].entrypoints=[[ join (merge .unifi.guest_portal.traefik .traefik).entrypoints "," ]]",
"[[ .traefik.instance ]].http.routers[[ .unifi.job_name ]]-portal[[ .env.suffix ]].tls=true",
"[[ .traefik.instance ]].http.routers[[ .unifi.job_name ]]-portal[[ .env.suffix ]].middlewares=[[ template "common/traefik_middlewares.tpl" merge .unifi.guest_portal.traefik .traefik ]]"
]
}
@ -48,7 +48,7 @@ job [[ .unifi.job_name | toJSON ]] {
tags = [
"[[ .traefik.instance ]].enable=true",
"[[ .traefik.instance ]].udp.routers.unifi-stun[[ .env.suffix ]].entrypoints=[[ join .unifi.stun.traefik.entrypoints "," ]]",
"[[ .traefik.instance ]].udp.routers[[ .unifi.job_name ]]-stun[[ .env.suffix ]].entrypoints=[[ join .unifi.stun.traefik.entrypoints "," ]]",
"[[ .traefik.instance ]].consulcatalog.connect=false"
]
}