[frontend,matrix] finally fix order bug with traefik by assigning priorities

This commit is contained in:
Quentin 2020-03-09 14:11:24 +01:00
parent 3c444363de
commit 1fee0441e8
6 changed files with 37 additions and 16 deletions

View file

@ -27,3 +27,5 @@
!chat/**/*
!directory/*/*
!traefik/traefik.toml

View file

@ -61,6 +61,15 @@ listeners:
resources:
- names: [client]
compress: true
- port: 8448
tls: false
bind_address: ''
type: http
x_forwarded: false
resources:
- names: [federation]
compress: false

View file

@ -1,2 +0,0 @@
CF_API_EMAIL = "<email>"
CF_API_KEY = "<token>"

View file

@ -4,8 +4,6 @@ defaultEntryPoints = ["http", "https"]
[entryPoints]
[entryPoints.admin]
address = ":8082"
[entryPoints.admin.auth.basic]
users = ["<username>:<hash>"]
[entryPoints.http]
address = ":80"
@ -17,6 +15,11 @@ defaultEntryPoints = ["http", "https"]
compress = true
[entryPoints.https.tls]
[entryPoints.matrix]
address = ":8448"
compress = true
[entryPoints.matrix.tls]
[retry]
[acme]
@ -25,16 +28,9 @@ defaultEntryPoints = ["http", "https"]
entryPoint = "https"
onHostRule = true
# [acme.dnsChallenge]
# provider = "cloudflare"
# delayBeforeCheck = 0
[acme.httpChallenge]
entryPoint = "http"
#[[acme.domains]]
# main = "deuxfleurs.fr"
[api]
entryPoint = "admin"
dashboard = true
@ -49,5 +45,3 @@ defaultEntryPoints = ["http", "https"]
prefix = "traefik"
domain = "web.deuxfleurs.fr"
exposedByDefault = false

View file

@ -12,6 +12,7 @@ job "chat" {
readonly_rootfs = true
port_map {
client_port = 8008
federation_port = 8448
}
command = "python"
args = [
@ -96,18 +97,20 @@ job "chat" {
memory = 4000
network {
port "client_port" { }
port "federation_port" { }
}
}
service {
name = "synapse"
name = "synapse-client"
port = "client_port"
address_mode = "host"
tags = [
"matrix",
"traefik.enable=true",
"traefik.frontend.entryPoints=https",
"traefik.frontend.rule=Host:im.deuxfleurs.fr,deuxfleurs.fr;PathPrefix:/_matrix"
"traefik.frontend.rule=Host:im.deuxfleurs.fr;PathPrefix:/_matrix",
"traefik.frontend.priority=100"
]
check {
type = "tcp"
@ -121,6 +124,20 @@ job "chat" {
}
}
}
service {
name = "synapse-federation"
port = "federation_port"
address_mode = "host"
tags = [
"matrix",
"traefik.enable=true",
"traefik.frontend.entryPoints=https",
"traefik.frontend.rule=Host:deuxfleurs.fr;PathPrefix:/_matrix",
"traefik.frontend.priority=100"
]
}
}
}

View file

@ -38,7 +38,8 @@ EOH
"webstatic",
"traefik.enable=true",
"traefik.frontend.entryPoints=https,http",
"traefik.frontend.rule=Host:deuxfleurs.fr,www.deuxfleurs.fr,deuxfleurs.org,www.deuxfleurs.org;PathPrefix:/"
"traefik.frontend.rule=Host:deuxfleurs.fr,www.deuxfleurs.fr,deuxfleurs.org,www.deuxfleurs.org;PathPrefix:/",
"traefik.frontend.priority=10"
]
port = "web_port"
address_mode = "host"