From ea1b93117f532722b611077aece014ac9eb860c2 Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Tue, 23 Jun 2020 18:04:37 +0200 Subject: [PATCH] fix nginx --- conf/nginx.conf | 20 +++++++------------- manifest.json | 2 +- 2 files changed, 8 insertions(+), 14 deletions(-) diff --git a/conf/nginx.conf b/conf/nginx.conf index f78a0cc..b923d5b 100644 --- a/conf/nginx.conf +++ b/conf/nginx.conf @@ -1,20 +1,10 @@ location ^~ __PATH__/ { - # Force usage of https - if ($scheme = http) { - rewrite ^ https://$server_name$request_uri? permanent; - } - proxy_pass http://127.0.0.1:__PORT__; - proxy_redirect off; - proxy_set_header Host $host; - proxy_set_header X-Real-IP $remote_addr; - proxy_set_header X-Forwarded-Proto $scheme; - proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; - proxy_set_header X-Forwarded-Host $server_name; - + proxy_pass http://127.0.0.1:__PORT__/; proxy_http_version 1.1; - proxy_set_header Upgrade $http_upgrade; proxy_set_header Connection "upgrade"; + proxy_set_header Upgrade $http_upgrade; + proxy_set_header X-Forwarded-For $remote_addr; # setup for image upload client_max_body_size 8192m; @@ -22,4 +12,8 @@ location ^~ __PATH__/ { proxy_read_timeout 300; proxy_connect_timeout 300; + + # Include SSOWAT user panel. + include conf.d/yunohost_panel.conf.inc; + more_clear_input_headers 'Accept-Encoding'; } diff --git a/manifest.json b/manifest.json index 4bd43d6..74d0131 100644 --- a/manifest.json +++ b/manifest.json @@ -6,7 +6,7 @@ "en": "Collaborative editor to work on notes written in Markdown", "fr": "Éditeur collaboratif pour travailler sur des notes en Markdown" }, - "version": "1.6.0~ynh3", + "version": "1.6.0~ynh4", "url": "https://github.com/codimd/server", "license": "AGPL-3.0-only", "maintainer": {