From 3c512b5fd4cef9d4838aa3be833570e49ab2d557 Mon Sep 17 00:00:00 2001 From: creme Date: Tue, 18 Feb 2020 09:48:25 +0000 Subject: [PATCH 1/2] update nginx for matrix-maubot --- etc/nginx/sites-available/envs.net.conf | 11 +++++++++++ etc/nginx/sites-available/matrix.envs.net.conf | 11 +++++++++++ 2 files changed, 22 insertions(+) diff --git a/etc/nginx/sites-available/envs.net.conf b/etc/nginx/sites-available/envs.net.conf index 494ef0b..9b2ee5e 100644 --- a/etc/nginx/sites-available/envs.net.conf +++ b/etc/nginx/sites-available/envs.net.conf @@ -86,6 +86,17 @@ server { proxy_pass https://matrix.envs.net; } + # maubot logs + location /_matrix/maubot/v1/logs { + include proxy_params; + proxy_ssl_name $http_host; + proxy_ssl_server_name on; + proxy_http_version 1.1; + proxy_set_header Upgrade $http_upgrade; + proxy_set_header Connection "Upgrade"; + proxy_pass https://matrix.envs.net; + } + # users location ~ ^/(~|u/)(?[\w-]+)(?/.*)?$ { alias /home/$user/public_html$user_uri; diff --git a/etc/nginx/sites-available/matrix.envs.net.conf b/etc/nginx/sites-available/matrix.envs.net.conf index 3f62f93..383f13a 100644 --- a/etc/nginx/sites-available/matrix.envs.net.conf +++ b/etc/nginx/sites-available/matrix.envs.net.conf @@ -24,6 +24,17 @@ server { proxy_ssl_server_name on; proxy_pass https://matrix.envs.net; } + + # maubot log + location /_matrix/maubot/v1/logs { + include proxy_params; + proxy_ssl_name $http_host; + proxy_ssl_server_name on; + proxy_http_version 1.1; + proxy_set_header Upgrade $http_upgrade; + proxy_set_header Connection "Upgrade"; + proxy_pass https://matrix.envs.net/_matrix/maubot/v1/logs; + } } From d8d6833300fc803693d15436be18848025d3e82e Mon Sep 17 00:00:00 2001 From: creme Date: Tue, 18 Feb 2020 09:59:51 +0000 Subject: [PATCH 2/2] nginx conf: change spaces to tab --- etc/nginx/sites-available/matrix.envs.net.conf | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/etc/nginx/sites-available/matrix.envs.net.conf b/etc/nginx/sites-available/matrix.envs.net.conf index 383f13a..b9eecae 100644 --- a/etc/nginx/sites-available/matrix.envs.net.conf +++ b/etc/nginx/sites-available/matrix.envs.net.conf @@ -27,9 +27,9 @@ server { # maubot log location /_matrix/maubot/v1/logs { - include proxy_params; - proxy_ssl_name $http_host; - proxy_ssl_server_name on; + include proxy_params; + proxy_ssl_name $http_host; + proxy_ssl_server_name on; proxy_http_version 1.1; proxy_set_header Upgrade $http_upgrade; proxy_set_header Connection "Upgrade";