From 438db87a68126d313c6e478818b4a66689d5a1d1 Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Thu, 17 Sep 2020 09:27:05 +0200 Subject: [PATCH] Update nginx.conf --- conf/nginx.conf | 37 +++++++++++++++++++++++++++++-------- 1 file changed, 29 insertions(+), 8 deletions(-) diff --git a/conf/nginx.conf b/conf/nginx.conf index 7aaf50e..1e21554 100644 --- a/conf/nginx.conf +++ b/conf/nginx.conf @@ -1,18 +1,39 @@ +#sub_path_only rewrite ^__PATH__$ __PATH__/ permanent; location __PATH__/ { alias __FINALPATH__/; - add_header Access-Control-Allow-Origin *; - - location ~ \.php$ { - include snippets/fastcgi-php.conf; - fastcgi_pass unix:/var/run/php/php__PHPVERSION__-fpm__NAME__.sock; + if ($scheme = http) { + rewrite ^ https://$server_name$request_uri? permanent; } - location /ws/ { - proxy_pass http://127.0.0.1:__PORT__/; + add_header Access-Control-Allow-Origin *; + + index index.php; + try_files $uri $uri/ /index.php; + + location ~ [^/]\.php(/|$) { + include snippets/fastcgi-php.conf; + fastcgi_pass unix:/var/run/php/php__PHPVERSION__-fpm__NAME__.sock; + fastcgi_index index.php; + include fastcgi_params; + fastcgi_param REMOTE_USER $remote_user; + fastcgi_param PATH_INFO $fastcgi_path_info; + fastcgi_param SCRIPT_FILENAME $request_filename; + } + + location ~ ^__PATH__/ws/ { + proxy_pass http://localhost:__PORT__; proxy_http_version 1.1; proxy_set_header Upgrade $http_upgrade; proxy_set_header Connection "Upgrade"; - include proxy_params; + proxy_set_header Host $host; + proxy_set_header X-Real-IP $remote_addr; + proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; + proxy_set_header X-Forwarded-Proto https; + proxy_redirect off; } + + # Include SSOWAT user panel. + include conf.d/yunohost_panel.conf.inc; + }