From 1fee0441e817483bd20bda370d3a87d3eb37feef Mon Sep 17 00:00:00 2001
From: Quentin Dufour <quentin@deuxfleurs.fr>
Date: Mon, 9 Mar 2020 14:11:24 +0100
Subject: [frontend,matrix] finally fix order bug with traefik by assigning
 priorities

---
 consul/configuration/.gitignore                    |  2 +
 consul/configuration/chat/synapse/homeserver.yaml  |  9 ++++
 consul/configuration/traefik/cloudflare.env.sample |  2 -
 consul/configuration/traefik/traefik.toml          | 47 +++++++++++++++++++
 consul/configuration/traefik/traefik.toml.sample   | 53 ----------------------
 5 files changed, 58 insertions(+), 55 deletions(-)
 delete mode 100644 consul/configuration/traefik/cloudflare.env.sample
 create mode 100644 consul/configuration/traefik/traefik.toml
 delete mode 100644 consul/configuration/traefik/traefik.toml.sample

(limited to 'consul')

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 b/consul/configuration/traefik/traefik.toml
new file mode 100644
index 0000000..ce50532
--- /dev/null
+++ b/consul/configuration/traefik/traefik.toml
@@ -0,0 +1,47 @@
+InsecureSkipVerify = true
+defaultEntryPoints = ["http", "https"]
+
+[entryPoints]
+  [entryPoints.admin]
+    address = ":8082"
+
+  [entryPoints.http]
+  address = ":80"
+    [entryPoints.http.redirect]
+    entryPoint = "https"
+
+  [entryPoints.https]
+  address = ":443"
+  compress = true
+    [entryPoints.https.tls]
+
+  [entryPoints.matrix]
+  address = ":8448"
+  compress = true
+    [entryPoints.matrix.tls]
+
+[retry]
+
+[acme]
+  email = "quentin@dufour.io"
+  storage = "traefik/acme/account"
+  entryPoint = "https"
+  onHostRule = true
+
+  [acme.httpChallenge]
+    entryPoint = "http"
+
+[api]
+  entryPoint = "admin"
+  dashboard = true
+
+[consul]
+  endpoint = "consul.service.2.cluster.deuxfleurs.fr:8500"
+  watch = true
+  prefix = "traefik"
+
+[consulCatalog]
+  endpoint = "consul.service.2.cluster.deuxfleurs.fr:8500"
+  prefix = "traefik"
+  domain = "web.deuxfleurs.fr"
+  exposedByDefault = false
diff --git a/consul/configuration/traefik/traefik.toml.sample b/consul/configuration/traefik/traefik.toml.sample
deleted file mode 100644
index 1e34554..0000000
--- a/consul/configuration/traefik/traefik.toml.sample
+++ /dev/null
@@ -1,53 +0,0 @@
-InsecureSkipVerify = true
-defaultEntryPoints = ["http", "https"]
-
-[entryPoints]
-  [entryPoints.admin]
-    address = ":8082"
-    [entryPoints.admin.auth.basic]
-      users = ["<username>:<hash>"]
-
-  [entryPoints.http]
-  address = ":80"
-    [entryPoints.http.redirect]
-    entryPoint = "https"
-
-  [entryPoints.https]
-  address = ":443"
-  compress = true
-    [entryPoints.https.tls]
-
-[retry]
-
-[acme]
-  email = "quentin@dufour.io"
-  storage = "traefik/acme/account"
-  entryPoint = "https"
-  onHostRule = true
-
-#  [acme.dnsChallenge]
-#    provider = "cloudflare"
-#    delayBeforeCheck = 0
-
-  [acme.httpChallenge]
-    entryPoint = "http"
-
-#[[acme.domains]]
-#  main = "deuxfleurs.fr"
-
-[api]
-  entryPoint = "admin"
-  dashboard = true
-
-[consul]
-  endpoint = "consul.service.2.cluster.deuxfleurs.fr:8500"
-  watch = true
-  prefix = "traefik"
-
-[consulCatalog]
-  endpoint = "consul.service.2.cluster.deuxfleurs.fr:8500"
-  prefix = "traefik"
-  domain = "web.deuxfleurs.fr"
-  exposedByDefault = false
-
-
-- 
cgit v1.2.3