From daf4604418de21acf2f784ddad0493105f92b8b9 Mon Sep 17 00:00:00 2001 From: Yalh Date: Sun, 27 Jan 2019 06:11:33 +0100 Subject: [PATCH] Fix skipped URIS --- conf/nginx.conf | 27 ++++++++++++++++++--------- scripts/install | 4 ++-- 2 files changed, 20 insertions(+), 11 deletions(-) diff --git a/conf/nginx.conf b/conf/nginx.conf index 92a8bf7..4052523 100644 --- a/conf/nginx.conf +++ b/conf/nginx.conf @@ -43,17 +43,26 @@ location /Microsoft-Server-ActiveSync { location /AutoDiscover/AutoDiscover.xml { - alias /usr/share/z-push/autodiscover/autodiscover.php; - #fastcgi_pass unix:/var/run/php/php7.0-fpm.sock; # for PHP 7.X Debian/Ubuntu - fastcgi_pass unix:/var/run/php5-fpm-__NAME__.sock; + alias /usr/share/z-push/autodiscover/autodiscover.php; + #fastcgi_pass unix:/var/run/php/php7.0-fpm.sock; # for PHP 7.X Debian/Ubuntu + fastcgi_pass unix:/var/run/php5-fpm-__NAME__.sock; + include fastcgi_params; + fastcgi_param HTTPS on; + fastcgi_param SCRIPT_FILENAME $request_filename; } location /Autodiscover/Autodiscover.xml { - alias /usr/share/z-push/autodiscover/autodiscover.php; - #fastcgi_pass unix:/var/run/php/php7.0-fpm.sock; # for PHP 7.X Debian/Ubuntu - fastcgi_pass unix:/var/run/php5-fpm-__NAME__.sock; + alias /usr/share/z-push/autodiscover/autodiscover.php; + #fastcgi_pass unix:/var/run/php/php7.0-fpm.sock; # for PHP 7.X Debian/Ubuntu + fastcgi_pass unix:/var/run/php5-fpm-__NAME__.sock; + include fastcgi_params; + fastcgi_param HTTPS on; + fastcgi_param SCRIPT_FILENAME $request_filename; } location /autodiscover/autodiscover.xml { - alias /usr/share/z-push/autodiscover/autodiscover.php; - #fastcgi_pass unix:/var/run/php/php7.0-fpm.sock; # for PHP 7.X Debian/Ubuntu - fastcgi_pass unix:/var/run/php5-fpm-__NAME__.sock; + alias /usr/share/z-push/autodiscover/autodiscover.php; + #fastcgi_pass unix:/var/run/php/php7.0-fpm.sock; # for PHP 7.X Debian/Ubuntu + fastcgi_pass unix:/var/run/php5-fpm-__NAME__.sock; + include fastcgi_params; + fastcgi_param HTTPS on; + fastcgi_param SCRIPT_FILENAME $request_filename; } \ No newline at end of file diff --git a/scripts/install b/scripts/install index c5f843a..b4fad0d 100755 --- a/scripts/install +++ b/scripts/install @@ -367,8 +367,8 @@ ynh_use_logrotate if [ $is_public -eq 1 ] then # unprotected_uris allows SSO credentials to be passed anyway. - ynh_app_setting_set $app unprotected_uris "/" - ynh_app_setting_set $app skipped_uris "$path_url_autodiscover1,$path_url_autodiscover2,$path_url_autodiscover1" + #ynh_app_setting_set $app unprotected_uris "/" + ynh_app_setting_set $app skipped_uris "path_url_activesync,$path_url_autodiscover1,$path_url_autodiscover2,$path_url_autodiscover1" fi #=================================================