From 96730c84d79cdd24cdcbe7240ec66267b4c3baee Mon Sep 17 00:00:00 2001 From: Xavier ROOT Date: Wed, 16 Dec 2015 13:37:30 +0100 Subject: [PATCH] add sso parameters and edit indentation --- conf/nginx.conf | 62 ++++++++++++++++++++++++++----------------------- 1 file changed, 33 insertions(+), 29 deletions(-) diff --git a/conf/nginx.conf b/conf/nginx.conf index 0a3c406..44ab002 100644 --- a/conf/nginx.conf +++ b/conf/nginx.conf @@ -2,44 +2,48 @@ location PATHTOCHANGE { alias ALIASTOCHANGE; if ($scheme = http) { - rewrite ^ https://$server_name$request_uri? permanent; + rewrite ^ https://$server_name$request_uri? permanent; } - index index.php; - try_files $uri $uri/ /index.php; + index index.php; + try_files $uri $uri/ /index.php; location ~ [^/]\.php(/|$) { - fastcgi_split_path_info ^(.+?\.php)(/.*)$; - fastcgi_pass unix:/var/run/php5-fpm-movim.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; - } + fastcgi_split_path_info ^(.+?\.php)(/.*)$; + fastcgi_pass unix:/var/run/php5-fpm-movim.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 ~ ^PATHTOCHANGE/ws/ { - proxy_pass http://localhost:YHPORT; - proxy_http_version 1.1; - proxy_set_header Upgrade $http_upgrade; - proxy_set_header Connection "Upgrade"; - 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; + location ~ ^PATHTOCHANGE/ws/ { + proxy_pass http://localhost:YHPORT; + proxy_http_version 1.1; + proxy_set_header Upgrade $http_upgrade; + proxy_set_header Connection "Upgrade"; + 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; - # To avoid disconnecting after 60sec : - proxy_read_timeout 14400s; - proxy_send_timeout 14400s; - # (14400s is 4h) - } -} + # To avoid disconnecting after 60sec : + proxy_read_timeout 14400s; + proxy_send_timeout 14400s; + # (14400s is 4h) + } + } location ~ /\.ht { - deny all; + deny all; } location ~ /(config|log)$ { - return 403; + return 403; } + +# Include SSOWAT user panel. +include conf.d/yunohost_panel.conf.inc; +