diff --git a/consul_service/syno.json b/consul_service/syno.json index 895f0c6..81e0fa0 100644 --- a/consul_service/syno.json +++ b/consul_service/syno.json @@ -14,7 +14,8 @@ "traefik.enable=true", "traefik.http.routers.syno.rule=Host(`syno.ducamps.win`)", "traefik.http.routers.syno.tls.domains[0].sans=syno.ducamps.win", - "traefik.http.routers.syno.tls.certresolver=myresolver" + "traefik.http.routers.syno.tls.certresolver=myresolver", + "traefik.http.routers.syno.entrypoints=web,websecure" ] } } diff --git a/nomad-job/chainetv.nomad b/nomad-job/chainetv.nomad index 55ea190..582397e 100644 --- a/nomad-job/chainetv.nomad +++ b/nomad-job/chainetv.nomad @@ -31,6 +31,7 @@ job "chainetv" { "traefik.http.routers.${NOMAD_JOB_NAME}.rule=Host(`www.ducamps.win`)&&PathPrefix(`/chainetv`)", "traefik.http.routers.${NOMAD_JOB_NAME}.tls.domains[0].sans=www.ducamps.win", "traefik.http.routers.${NOMAD_JOB_NAME}.tls.certresolver=myresolver", + "traefik.http.routers.${NOMAD_JOB_NAME}.entrypoints=web,websecure", "traefik.http.routers.${NOMAD_JOB_NAME}.middlewares=chainetv,chainetvStrip", "traefik.http.middlewares.chainetv.headers.customrequestheaders.X-Script-Name=/chainetv", "traefik.http.middlewares.chainetvStrip.stripprefix.prefixes=/chainetv", diff --git a/nomad-job/dashboard.nomad b/nomad-job/dashboard.nomad index e9f0537..012bd53 100644 --- a/nomad-job/dashboard.nomad +++ b/nomad-job/dashboard.nomad @@ -25,6 +25,7 @@ job "dashboard" { "traefik.http.routers.${NOMAD_JOB_NAME}.rule=Host(`${NOMAD_JOB_NAME}.ducamps.win`)", "traefik.http.routers.${NOMAD_JOB_NAME}.tls.domains[0].sans=${NOMAD_JOB_NAME}.ducamps.win", "traefik.http.routers.${NOMAD_JOB_NAME}.tls.certresolver=myresolver", + "traefik.http.routers.${NOMAD_JOB_NAME}.entrypoints=web,websecure", ] } config { diff --git a/nomad-job/dockermailserver.nomad b/nomad-job/dockermailserver.nomad index 326548b..95333f4 100644 --- a/nomad-job/dockermailserver.nomad +++ b/nomad-job/dockermailserver.nomad @@ -15,8 +15,6 @@ job "dockermailserver" { mode = "host" port "smtp" { to = 25 -# static = 25 -# host_network = "public" } port "imap" { to = 10993 @@ -85,6 +83,7 @@ job "dockermailserver" { name = "certmail" tags =[ "traefik.enable=true", + "traefik.http.routers.certmail.entrypoints=web,websecure", "traefik.http.routers.certmail.tls.domains[0].sans=mail.ducamps.eu", "traefik.http.routers.certmail.tls.certresolver=myresolver", ] diff --git a/nomad-job/drone.nomad b/nomad-job/drone.nomad index 7736854..2d50937 100644 --- a/nomad-job/drone.nomad +++ b/nomad-job/drone.nomad @@ -39,7 +39,8 @@ job "drone" { "traefik.http.routers.${NOMAD_JOB_NAME}.tls.domains[0].sans=${NOMAD_JOB_NAME}.ducamps.win", "traefik.http.routers.${NOMAD_JOB_NAME}.tls.certresolver=myresolver", "traefik.http.middlewares.httpsRedirect.redirectscheme.scheme=https", - "traefik.http.routers.${NOMAD_JOB_NAME}.middlewares=httpsRedirect" + "traefik.http.routers.${NOMAD_JOB_NAME}.middlewares=httpsRedirect", + "traefik.http.routers.${NOMAD_JOB_NAME}.entrypoints=web,websecure", ] } diff --git a/nomad-job/filestash.nomad b/nomad-job/filestash.nomad index aa58f53..caa67c8 100644 --- a/nomad-job/filestash.nomad +++ b/nomad-job/filestash.nomad @@ -38,6 +38,7 @@ job "filestash" { "traefik.http.routers.${NOMAD_JOB_NAME}.rule=Host(`file.ducamps.win`)", "traefik.http.routers.${NOMAD_JOB_NAME}.tls.domains[0].sans=file.ducamps.win", "traefik.http.routers.${NOMAD_JOB_NAME}.tls.certresolver=myresolver", + "traefik.http.routers.${NOMAD_JOB_NAME}.entrypoints=web,websecure", ] diff --git a/nomad-job/ghostfolio.nomad b/nomad-job/ghostfolio.nomad index 8e910c2..82984a9 100644 --- a/nomad-job/ghostfolio.nomad +++ b/nomad-job/ghostfolio.nomad @@ -45,6 +45,7 @@ job "ghostfolio" { "traefik.http.routers.${NOMAD_JOB_NAME}.rule=Host(`${NOMAD_JOB_NAME}.ducamps.win`)", "traefik.http.routers.${NOMAD_JOB_NAME}.tls.domains[0].sans=${NOMAD_JOB_NAME}.ducamps.win", "traefik.http.routers.${NOMAD_JOB_NAME}.tls.certresolver=myresolver", + "traefik.http.routers.${NOMAD_JOB_NAME}.entrypoints=web,websecure", ] diff --git a/nomad-job/gitea.nomad b/nomad-job/gitea.nomad index 150ff6a..5ab7be2 100644 --- a/nomad-job/gitea.nomad +++ b/nomad-job/gitea.nomad @@ -39,7 +39,8 @@ job "git" { "traefik.http.routers.${NOMAD_JOB_NAME}.tls.domains[0].sans=${NOMAD_JOB_NAME}.ducamps.win", "traefik.http.routers.${NOMAD_JOB_NAME}.tls.certresolver=myresolver", "traefik.http.middlewares.httpsRedirect.redirectscheme.scheme=https", - "traefik.http.routers.${NOMAD_JOB_NAME}.middlewares=httpsRedirect" + "traefik.http.routers.${NOMAD_JOB_NAME}.middlewares=httpsRedirect", + "traefik.http.routers.${NOMAD_JOB_NAME}.entrypoints=web,websecure", ] } diff --git a/nomad-job/grafana.nomad b/nomad-job/grafana.nomad index 9533152..f461c02 100644 --- a/nomad-job/grafana.nomad +++ b/nomad-job/grafana.nomad @@ -28,6 +28,8 @@ job "grafana" { "traefik.http.routers.grafana.rule=Host(`grafana.ducamps.win`)", "traefik.http.routers.grafana.tls.domains[0].sans=grafana.ducamps.win", "traefik.http.routers.grafana.tls.certresolver=myresolver", + "traefik.http.routers.grafana.entrypoints=web,websecure", + ] } diff --git a/nomad-job/homeassistant.nomad b/nomad-job/homeassistant.nomad index 1547b52..e8a10cd 100644 --- a/nomad-job/homeassistant.nomad +++ b/nomad-job/homeassistant.nomad @@ -43,6 +43,7 @@ job "homeassistant" { "traefik.http.routers.${NOMAD_TASK_NAME}.rule=Host(`${NOMAD_TASK_NAME}.ducamps.win`)", "traefik.http.routers.${NOMAD_TASK_NAME}.tls.domains[0].sans=${NOMAD_TASK_NAME}.ducamps.win", "traefik.http.routers.${NOMAD_TASK_NAME}.tls.certresolver=myresolver", + "traefik.http.routers.${NOMAD_TASK_NAME}.entrypoints=web,websecure", ] check { type = "tcp" diff --git a/nomad-job/jellyfin.nomad b/nomad-job/jellyfin.nomad index ae0e53c..ea8b14b 100644 --- a/nomad-job/jellyfin.nomad +++ b/nomad-job/jellyfin.nomad @@ -32,6 +32,7 @@ job "jellyfin" { "traefik.http.routers.${NOMAD_TASK_NAME}.rule=Host(`${NOMAD_TASK_NAME}.ducamps.win`)", "traefik.http.routers.${NOMAD_TASK_NAME}.tls.domains[0].sans=${NOMAD_TASK_NAME}.ducamps.win", "traefik.http.routers.${NOMAD_TASK_NAME}.tls.certresolver=myresolver", + "traefik.http.routers.${NOMAD_TASK_NAME}.entrypoints=web,websecure", ] } @@ -75,6 +76,7 @@ job "jellyfin" { "traefik.http.routers.${NOMAD_JOB_NAME}.rule=Host(`${NOMAD_JOB_NAME}.ducamps.win`)", "traefik.http.routers.${NOMAD_JOB_NAME}.tls.domains[0].sans=${NOMAD_JOB_NAME}.ducamps.win", "traefik.http.routers.${NOMAD_JOB_NAME}.tls.certresolver=myresolver", + "traefik.http.routers.${NOMAD_JOB_NAME}.entrypoints=web,websecure", ] diff --git a/nomad-job/pacoloco.nomad b/nomad-job/pacoloco.nomad index be37f59..4daa320 100644 --- a/nomad-job/pacoloco.nomad +++ b/nomad-job/pacoloco.nomad @@ -24,6 +24,7 @@ job "pacoloco" { "traefik.http.routers.${NOMAD_JOB_NAME}.rule=Host(`arch.ducamps.win`)", "traefik.http.routers.${NOMAD_JOB_NAME}.tls.domains[0].sans=arch.ducamps.win", "traefik.http.routers.${NOMAD_JOB_NAME}.tls.certresolver=myresolver", + "traefik.http.routers.${NOMAD_JOB_NAME}.entrypoints=web,websecure", ] } config { diff --git a/nomad-job/paperless-ng.nomad b/nomad-job/paperless-ng.nomad index e43cfc7..cb49e2d 100644 --- a/nomad-job/paperless-ng.nomad +++ b/nomad-job/paperless-ng.nomad @@ -46,6 +46,7 @@ job "paperless-ng" { "traefik.http.routers.${NOMAD_JOB_NAME}.rule=Host(`${NOMAD_JOB_NAME}.ducamps.win`)", "traefik.http.routers.${NOMAD_JOB_NAME}.tls.domains[0].sans=${NOMAD_JOB_NAME}.ducamps.win", "traefik.http.routers.${NOMAD_JOB_NAME}.tls.certresolver=myresolver", + "traefik.http.routers.${NOMAD_JOB_NAME}.entrypoints=web,websecure", "homer.enable=true", "homer.name=Paperless", "homer.service=Application", diff --git a/nomad-job/radicale.nomad b/nomad-job/radicale.nomad index 44f5faf..68f4b2c 100644 --- a/nomad-job/radicale.nomad +++ b/nomad-job/radicale.nomad @@ -32,6 +32,7 @@ job "radicale" { "traefik.http.routers.${NOMAD_JOB_NAME}.tls.domains[0].sans=www.ducamps.win", "traefik.http.routers.${NOMAD_JOB_NAME}.tls.certresolver=myresolver", "traefik.http.routers.${NOMAD_JOB_NAME}.middlewares=radicaleHeader,radicalestrip", + "traefik.http.routers.${NOMAD_JOB_NAME}.entrypoints=web,websecure", "traefik.http.middlewares.radicaleHeader.headers.customrequestheaders.X-Script-Name=/radicale", "traefik.http.middlewares.radicalestrip.stripprefix.prefixes=/radicale", diff --git a/nomad-job/rutorrent.nomad b/nomad-job/rutorrent.nomad index 63fc9ad..61838cd 100644 --- a/nomad-job/rutorrent.nomad +++ b/nomad-job/rutorrent.nomad @@ -39,6 +39,7 @@ job "torrent" { "traefik.http.routers.${NOMAD_JOB_NAME}.rule=Host(`${NOMAD_JOB_NAME}.ducamps.win`)", "traefik.http.routers.${NOMAD_JOB_NAME}.tls.domains[0].sans=${NOMAD_JOB_NAME}.ducamps.win", "traefik.http.routers.${NOMAD_JOB_NAME}.tls.certresolver=myresolver", + "traefik.http.routers.${NOMAD_JOB_NAME}.entrypoints=web,websecure", ] diff --git a/nomad-job/supysonic.nomad b/nomad-job/supysonic.nomad index 7ba9a14..71fbdac 100644 --- a/nomad-job/supysonic.nomad +++ b/nomad-job/supysonic.nomad @@ -40,6 +40,7 @@ job "supysonic" { "traefik.http.routers.${NOMAD_JOB_NAME}.rule=Host(`${NOMAD_JOB_NAME}.ducamps.win`)", "traefik.http.routers.${NOMAD_JOB_NAME}.tls.domains[0].sans=${NOMAD_JOB_NAME}.ducamps.win", "traefik.http.routers.${NOMAD_JOB_NAME}.tls.certresolver=myresolver", + "traefik.http.routers.${NOMAD_JOB_NAME}.entrypoints=web,websecure", ] diff --git a/nomad-job/tt-rss.nomad b/nomad-job/tt-rss.nomad index 54f5aa8..39bf979 100644 --- a/nomad-job/tt-rss.nomad +++ b/nomad-job/tt-rss.nomad @@ -42,6 +42,7 @@ job "tt-rss" { "traefik.http.routers.${NOMAD_JOB_NAME}.rule=Host(`www.ducamps.win`)&&PathPrefix(`/tt-rss`)", "traefik.http.routers.${NOMAD_JOB_NAME}.tls.domains[0].sans=www.ducamps.win", "traefik.http.routers.${NOMAD_JOB_NAME}.tls.certresolver=myresolver", + "traefik.http.routers.${NOMAD_JOB_NAME}.entrypoints=web,websecure", ] } diff --git a/nomad-job/vaultwarden.nomad b/nomad-job/vaultwarden.nomad index 8becbfb..35e4185 100644 --- a/nomad-job/vaultwarden.nomad +++ b/nomad-job/vaultwarden.nomad @@ -35,6 +35,7 @@ job "vaultwarden" { "traefik.http.routers.${NOMAD_JOB_NAME}.rule=Host(`vault.ducamps.win`)", "traefik.http.routers.${NOMAD_JOB_NAME}.tls.domains[0].sans=vault.ducamps.win", "traefik.http.routers.${NOMAD_JOB_NAME}.tls.certresolver=myresolver", + "traefik.http.routers.${NOMAD_JOB_NAME}.entrypoints=web,websecure", ] check { type = "http" diff --git a/nomad-job/vikunja.nomad b/nomad-job/vikunja.nomad index 9f83b0e..69ae486 100644 --- a/nomad-job/vikunja.nomad +++ b/nomad-job/vikunja.nomad @@ -31,6 +31,7 @@ job "vikunja" { "traefik.http.routers.${NOMAD_JOB_NAME}-${NOMAD_TASK_NAME}.rule=Host(`${NOMAD_JOB_NAME}.ducamps.win`) && PathPrefix(`/api/v1`, `/dav/`, `/.well-known/`)", "traefik.http.routers.${NOMAD_JOB_NAME}-${NOMAD_TASK_NAME}.tls.domains[0].sans=${NOMAD_JOB_NAME}.ducamps.win", "traefik.http.routers.${NOMAD_JOB_NAME}-${NOMAD_TASK_NAME}.tls.certresolver=myresolver", + "traefik.http.routers.${NOMAD_JOB_NAME}-${NOMAD_TASK_NAME}.entrypoint=web,websecure", ] } config { @@ -69,6 +70,7 @@ job "vikunja" { "traefik.http.routers.${NOMAD_JOB_NAME}-${NOMAD_TASK_NAME}.rule=Host(`${NOMAD_JOB_NAME}.ducamps.win`)", "traefik.http.routers.${NOMAD_JOB_NAME}-${NOMAD_TASK_NAME}.tls.domains[0].sans=${NOMAD_JOB_NAME}.ducamps.win", "traefik.http.routers.${NOMAD_JOB_NAME}-${NOMAD_TASK_NAME}.tls.certresolver=myresolver", + "traefik.http.routers.${NOMAD_JOB_NAME}-${NOMAD_TASK_NAME}.entrypoints=web,websecure", "homer.enable=true", "homer.name=vikunka", "homer.service=Application", diff --git a/nomad-job/www.nomad b/nomad-job/www.nomad index e731fb3..1ce67d7 100644 --- a/nomad-job/www.nomad +++ b/nomad-job/www.nomad @@ -24,8 +24,10 @@ job "www" { "traefik.http.routers.${NOMAD_JOB_NAME}.rule=Host(`${NOMAD_JOB_NAME}.ducamps.win`)", "traefik.http.routers.${NOMAD_JOB_NAME}.tls.domains[0].sans=${NOMAD_JOB_NAME}.ducamps.win", "traefik.http.routers.${NOMAD_JOB_NAME}.tls.certresolver=myresolver", + "traefik.http.routers.${NOMAD_JOB_NAME}.entrypoint=web,websecure", "traefik.http.routers.default.rule=Host(`ducamps.win`)", + "traefik.http.routers.default.entrypoint=web,websecure", "traefik.http.routers.default.tls.domains[0].sans=ducamps.win", "traefik.http.routers.default.tls.certresolver=myresolver", ]