aboutsummaryrefslogtreecommitdiff
path: root/consul
diff options
context:
space:
mode:
authorQuentin Dufour <quentin@deuxfleurs.fr>2020-03-09 14:11:24 +0100
committerQuentin Dufour <quentin@deuxfleurs.fr>2020-03-09 14:11:24 +0100
commit1fee0441e817483bd20bda370d3a87d3eb37feef (patch)
treed82a7323405f0afe0ef12fb8fcf4fd2df153560d /consul
parent3c444363de260d479f50d894b853f49b58daed6c (diff)
downloadinfrastructure-1fee0441e817483bd20bda370d3a87d3eb37feef.tar.gz
infrastructure-1fee0441e817483bd20bda370d3a87d3eb37feef.zip
[frontend,matrix] finally fix order bug with traefik by assigning priorities
Diffstat (limited to 'consul')
-rw-r--r--consul/configuration/.gitignore2
-rw-r--r--consul/configuration/chat/synapse/homeserver.yaml9
-rw-r--r--consul/configuration/traefik/cloudflare.env.sample2
-rw-r--r--consul/configuration/traefik/traefik.toml (renamed from consul/configuration/traefik/traefik.toml.sample)16
4 files changed, 16 insertions, 13 deletions
diff --git a/consul/configuration/.gitignore b/consul/configuration/.gitignore
index 8c55cc6..dabb84d 100644
--- a/consul/configuration/.gitignore
+++ b/consul/configuration/.gitignore
@@ -27,3 +27,5 @@
!chat/**/*
!directory/*/*
+
+!traefik/traefik.toml
diff --git a/consul/configuration/chat/synapse/homeserver.yaml b/consul/configuration/chat/synapse/homeserver.yaml
index 0534235..7f313f6 100644
--- a/consul/configuration/chat/synapse/homeserver.yaml
+++ b/consul/configuration/chat/synapse/homeserver.yaml
@@ -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
diff --git a/consul/configuration/traefik/cloudflare.env.sample b/consul/configuration/traefik/cloudflare.env.sample
deleted file mode 100644
index 072e671..0000000
--- a/consul/configuration/traefik/cloudflare.env.sample
+++ /dev/null
@@ -1,2 +0,0 @@
-CF_API_EMAIL = "<email>"
-CF_API_KEY = "<token>"
diff --git a/consul/configuration/traefik/traefik.toml.sample b/consul/configuration/traefik/traefik.toml
index 1e34554..ce50532 100644
--- a/consul/configuration/traefik/traefik.toml.sample
+++ b/consul/configuration/traefik/traefik.toml
@@ -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
-
-