From 710bfe0f5754a128855dba829f10b58aab4da324 Mon Sep 17 00:00:00 2001
From: Bruno BELANYI <bruno@belanyi.fr>
Date: Wed, 15 Jul 2020 02:53:59 +0200
Subject: [PATCH] services: letsencrypt: Matrix JSON configuration

---
 .../nginx/proxy-confs/matrix.subdomain.conf        | 14 --------------
 letsencrypt/nginx/site-confs/default               |  7 +++++++
 2 files changed, 7 insertions(+), 14 deletions(-)

diff --git a/letsencrypt/nginx/proxy-confs/matrix.subdomain.conf b/letsencrypt/nginx/proxy-confs/matrix.subdomain.conf
index de1a0ac..0aa3694 100644
--- a/letsencrypt/nginx/proxy-confs/matrix.subdomain.conf
+++ b/letsencrypt/nginx/proxy-confs/matrix.subdomain.conf
@@ -23,17 +23,3 @@ server {
         client_max_body_size 10M;
     }
 }
-
-server {
-    listen 443 ssl;
-    listen [::]:443 ssl;
-
-    server_name belanyi.fr;
-
-    include /config/nginx/ssl.conf;
-
-    location /.well-known/matrix/server {
-        default_type application/json;
-        return 200 '{"m.server": "matrix.belanyi.fr:443"}';
-    }
-}
diff --git a/letsencrypt/nginx/site-confs/default b/letsencrypt/nginx/site-confs/default
index 9617a78..238b833 100644
--- a/letsencrypt/nginx/site-confs/default
+++ b/letsencrypt/nginx/site-confs/default
@@ -26,6 +26,13 @@ server {
     location / {
         try_files $uri $uri/ /index.html /index.php?$args =404;
     }
+
+    # Matrix configuration
+    location /.well-known/matrix/server {
+        default_type application/json;
+        return 200 '{"m.server": "matrix.belanyi.fr:443"}';
+    }
+
 }
 
 # CV block