From 5aceaa3fe88153ccc1c61eb5231a42f3aafb0af2 Mon Sep 17 00:00:00 2001
From: Isaac Shoebottom <ir.shoebottom@gmail.com>
Date: Wed, 15 Mar 2023 14:29:26 -0300
Subject: [PATCH] add http2 and delete redundant matrix config

---
 conduit.conf  | 22 ----------------------
 homepage.conf |  6 +++---
 2 files changed, 3 insertions(+), 25 deletions(-)
 delete mode 100644 conduit.conf

diff --git a/conduit.conf b/conduit.conf
deleted file mode 100644
index 194c66b..0000000
--- a/conduit.conf
+++ /dev/null
@@ -1,22 +0,0 @@
-server {
-    listen 443 ssl http2;
-    listen [::]:443 ssl http2;
-    listen 8448 ssl http2;
-    listen [::]:8448 ssl http2;
-    server_name matrix.shoebottom.ca; # EDIT THIS
-    merge_slashes off;
-
-    # Nginx defaults to only allow 1MB uploads
-    client_max_body_size 20M;
-
-    location /_matrix/ {
-        proxy_pass http://127.0.0.1:6167$request_uri;
-        proxy_set_header Host $http_host;
-        proxy_buffering off;
-    }
-
-	ssl_certificate /etc/letsencrypt/live/matrix.shoebottom.ca/fullchain.pem; # EDIT THIS
-    ssl_certificate_key /etc/letsencrypt/live/matrix.shoebottom.ca/privkey.pem; # EDIT THIS
-    ssl_trusted_certificate /etc/letsencrypt/live/matrix.shoebottom.ca/chain.pem; # EDIT THIS
-    include /etc/letsencrypt/options-ssl-nginx.conf;
-}
diff --git a/homepage.conf b/homepage.conf
index 05a8339..8c862f7 100644
--- a/homepage.conf
+++ b/homepage.conf
@@ -5,8 +5,8 @@ server {
     index index.html;
 
     # Listen on https
-    listen [::]:443 ssl ipv6only=on default_server; # managed by Certbot
-    listen 443 ssl default_server; # managed by Certbot
+    listen [::]:443 ssl http2 ipv6only=on default_server; # managed by Certbot
+    listen 443 ssl http2 default_server; # managed by Certbot
 
     # Listen for matrix port
     listen 8448 ssl http2;
@@ -16,9 +16,9 @@ server {
     # SSL configuration
     ssl_certificate /etc/letsencrypt/live/shoebottom.ca/fullchain.pem; # managed by Certbot
     ssl_certificate_key /etc/letsencrypt/live/shoebottom.ca/privkey.pem; # managed by Certbot
+    ssl_trusted_certificate /etc/letsencrypt/live/shoebottom.ca/chain.pem; # managed by Certbot
     include /etc/letsencrypt/options-ssl-nginx.conf; # managed by Certbot
     ssl_dhparam /etc/letsencrypt/ssl-dhparams.pem; # managed by Certbot
-    ssl_trusted_certificate /etc/letsencrypt/live/shoebottom.ca/chain.pem; # managed by Certbot
     ssl_stapling on; # managed by Certbot
     ssl_stapling_verify on; # managed by Certbot