diff --git a/conf/nginx.conf b/conf/nginx.conf index 8930081..f48e794 100644 --- a/conf/nginx.conf +++ b/conf/nginx.conf @@ -1,36 +1,39 @@ + location __PATH__/cache { + rewrite ^(.*)$ /error break; + } + + location __PATH__/content { + rewrite ^(.*)$ /error break; + } + + location __PATH__/system { + rewrite ^(.*)$ /error break; + } + #sub_path_only rewrite ^__PATH__$ __PATH__/ permanent; location __PATH__/ { + alias __FINALPATH__/ ; - # Path to source - alias __FINALPATH__/ ; + index index.html yellow.php; - client_max_body_size 100M; - autoindex off; - # Force usage of https - if ($scheme = http) { - rewrite ^ https://$server_name$request_uri? permanent; - } + #location __PATH__/ { + # if (!-e $request_filename) { + # rewrite ^/(.*)$ /yellow.php last; + # break; + # } + #} - if (!-e $request_filename) { +if (!-e $request_filename) { rewrite ^(.*)$ /yellow.php last; break; - } + } - index index.html yellow.php; - - try_files $uri $uri/ index.php; - location ~ [^/]\.php(/|$) { - fastcgi_split_path_info ^(.+?\.php)(/.*)$; - fastcgi_pass unix:/var/run/php/php__PHPVERSION__-fpm-__NAME__.sock; - - fastcgi_index yellow.php; - include fastcgi_params; - fastcgi_param REMOTE_USER $remote_user; - fastcgi_param PATH_INFO $fastcgi_path_info; - fastcgi_param SCRIPT_FILENAME $request_filename; - } - - # Include SSOWAT user panel. - include conf.d/yunohost_panel.conf.inc; + try_files $uri $uri/ index.php; + location ~ [^/]\.php(/|$) { + fastcgi_split_path_info ^(.+?\.php)(/.*)$; + fastcgi_pass unix:/var/run/php/php__PHPVERSION__-fpm-__NAME__.sock; + fastcgi_index yellow.php; + include fastcgi_params; + } } diff --git a/conf/nginx1.conf b/conf/nginx1.conf deleted file mode 100644 index cb0941c..0000000 --- a/conf/nginx1.conf +++ /dev/null @@ -1,33 +0,0 @@ -#sub_path_only rewrite ^__PATH__$ __PATH__/ permanent; -location __PATH__/ { - alias __FINALPATH__/ ; - - index index.html yellow.php; - - location __PATH__/cache { - rewrite ^(.*)$ /error break; - } - - location __PATH__/content { - rewrite ^(.*)$ /error break; - } - - location __PATH__/system { - rewrite ^(.*)$ /error break; - } - - location __PATH__/ { - if (!-e $request_filename) { - rewrite ^/(.*)$ /yellow.php last; - break; - } - } - - try_files $uri $uri/ index.php; - location ~ [^/]\.php(/|$) { - fastcgi_split_path_info ^(.+?\.php)(/.*)$; - fastcgi_pass unix:/var/run/php/php__PHPVERSION__-fpm-__NAME__.sock; - fastcgi_index yellow.php; - include fastcgi_params; - } -}