From 86459f4dd4242818bf97aea46d5b99163800b66b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?E=CC=81ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Fri, 7 Jun 2024 22:25:38 +0200 Subject: [PATCH] fix --- conf/nginx.conf | 20 +++++++++++++------- conf/systemd.service | 4 ++-- 2 files changed, 15 insertions(+), 9 deletions(-) diff --git a/conf/nginx.conf b/conf/nginx.conf index e8bc01d..8ae2f3e 100644 --- a/conf/nginx.conf +++ b/conf/nginx.conf @@ -2,17 +2,23 @@ location __PATH__/ { proxy_pass http://127.0.0.1:__PORT__/; - proxy_buffering off; proxy_set_header Host $host; proxy_pass_header Server; - proxy_set_header X-Real-IP $remote_addr; - proxy_set_header X-Forwarded-For $remote_addr; - proxy_set_header X-Forwarded-Proto $scheme; - proxy_http_version 1.1; + proxy_buffering off; + more_set_headers "X-Frame-Options : ALLOWALL"; + proxy_set_header X-Real-IP $remote_addr; # http://wiki.nginx.org/HttpProxyModule + proxy_set_header X-Forwarded-For $remote_addr; # EP logs to show the actual remote IP + proxy_set_header X-Forwarded-Proto $scheme; # for EP to set secure cookie flag when https is used + proxy_set_header Host $host; # pass the host header + proxy_http_version 1.1; # recommended with keepalive connections + + # WebSocket proxying - from http://nginx.org/en/docs/http/websocket.html + proxy_set_header Upgrade $http_upgrade; + proxy_set_header Connection $connection_upgrade; - proxy_set_header Upgrade $http_upgrade; - proxy_set_header Connection $connection_upgrade; + # Include SSOWAT user panel. + include conf.d/yunohost_panel.conf.inc; } location ~* __PATH__/p/[^/]*(_|%|\*)[^/]*/export/etherpad { diff --git a/conf/systemd.service b/conf/systemd.service index f79a12c..41a9091 100644 --- a/conf/systemd.service +++ b/conf/systemd.service @@ -12,8 +12,8 @@ Environment="__YNH_NODE_LOAD_PATH__" Environment="ETHERPAD_PRODUCTION=true" ExecStart=__INSTALL_DIR__/bin/run.sh Restart=always -StandardOutput=append:/var/log/etherpad/etherpad.log -StandardError=inherit +#StandardOutput=append:/var/log/etherpad/etherpad.log +#StandardError=inherit # Sandboxing options to harden security # Depending on specificities of your service/app, you may need to tweak these