aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorQuentin Dufour <quentin@deuxfleurs.fr>2020-05-05 16:34:16 +0200
committerQuentin Dufour <quentin@deuxfleurs.fr>2020-05-05 16:34:16 +0200
commit87ea44d161fc924a364011e42a337650e7897cc4 (patch)
tree7d63e838eaf20a141865a9da92835fed3c4fee42
parent7cf4ed0c872c926ab8a4bd8515c6e0d3880b14d9 (diff)
downloadinfrastructure-87ea44d161fc924a364011e42a337650e7897cc4.tar.gz
infrastructure-87ea44d161fc924a364011e42a337650e7897cc4.zip
Switch Traefik to an HTTP check
-rw-r--r--consul/configuration/traefik/traefik.toml6
-rw-r--r--nomad/traefik.hcl12
2 files changed, 7 insertions, 11 deletions
diff --git a/consul/configuration/traefik/traefik.toml b/consul/configuration/traefik/traefik.toml
index 6145ffb..03fca8a 100644
--- a/consul/configuration/traefik/traefik.toml
+++ b/consul/configuration/traefik/traefik.toml
@@ -15,10 +15,8 @@ defaultEntryPoints = ["http", "https"]
compress = true
[entryPoints.https.tls]
- [entryPoints.matrix]
- address = ":8448"
- compress = true
- [entryPoints.matrix.tls]
+[ping]
+entrypoint = "admin"
[retry]
diff --git a/nomad/traefik.hcl b/nomad/traefik.hcl
index 3796c2d..1edc8ef 100644
--- a/nomad/traefik.hcl
+++ b/nomad/traefik.hcl
@@ -13,7 +13,6 @@ job "frontend" {
https_port = 443
http_port = 80
adm_port = 8082
- synapse_federation_frontend = 8448
}
volumes = [
"secrets/traefik.toml:/etc/traefik/traefik.toml",
@@ -23,9 +22,6 @@ job "frontend" {
resources {
memory = 101
network {
- port "synapse_federation_frontend" {
- static = "8448"
- }
port "https_port" {
static = "443"
}
@@ -39,13 +35,15 @@ job "frontend" {
}
service {
- tags = ["https"]
+ tags = ["https", "frontend"]
port = "https_port"
address_mode = "host"
name = "traefik"
check {
- type = "tcp"
- port = "https_port"
+ type = "http"
+ protocol = "http"
+ port = "adm_port"
+ path = "/ping"
interval = "60s"
timeout = "5s"
check_restart {