From ac21165553eb239109f3d38631a49d1da212b9b9 Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Tue, 28 Sep 2021 14:11:23 +0200 Subject: [PATCH] Fix --- check_process | 2 +- conf/nginx.conf | 60 ++++++++++++++++++++++++++++++++++++++----------- 2 files changed, 48 insertions(+), 14 deletions(-) diff --git a/check_process b/check_process index a72c85a..ff597a9 100644 --- a/check_process +++ b/check_process @@ -16,7 +16,7 @@ upgrade=1 from_commit=CommitHash backup_restore=1 multi_instance=1 - change_url=1 + change_url=0 ;;; Options Email= Notification=none diff --git a/conf/nginx.conf b/conf/nginx.conf index f09671a..069bf89 100644 --- a/conf/nginx.conf +++ b/conf/nginx.conf @@ -1,34 +1,68 @@ #sub_path_only rewrite ^__PATH__$ __PATH__/ permanent; location __PATH__/ { - # Path to source alias __FINALPATH__/ ; + index index.php; - # Force usage of https if ($scheme = http) { rewrite ^ https://$server_name$request_uri? permanent; } - index index.php; + client_max_body_size 30m; - # Common parameter to increase upload size limit in conjunction with dedicated php-fpm file - #client_max_body_size 50M; + try_files $uri $uri/ __PATH__/index.php?q=$uri&$args; + + # Old image system ? + rewrite ^/([0-9])(-[_a-zA-Z0-9-]*)?(-[0-9]+)?/.+.jpg$ /img/p/$1/$1$2$3.jpg last; + rewrite ^/([0-9])([0-9])(-[_a-zA-Z0-9-]*)?(-[0-9]+)?/.+.jpg$ /img/p/$1/$2/$1$2$3$4.jpg last; + rewrite ^/([0-9])([0-9])([0-9])(-[_a-zA-Z0-9-]*)?(-[0-9]+)?/.+.jpg$ /img/p/$1/$2/$3/$1$2$3$4$5.jpg last; + rewrite ^/([0-9])([0-9])([0-9])([0-9])(-[_a-zA-Z0-9-]*)?(-[0-9]+)?/.+.jpg$ /img/p/$1/$2/$3/$4/$1$2$3$4$5$6.jpg last; + rewrite ^/([0-9])([0-9])([0-9])([0-9])([0-9])(-[_a-zA-Z0-9-]*)?(-[0-9]+)?/.+.jpg$ /img/p/$1/$2/$3/$4/$5/$1$2$3$4$5$6$7.jpg last; + rewrite ^/([0-9])([0-9])([0-9])([0-9])([0-9])([0-9])(-[_a-zA-Z0-9-]*)?(-[0-9]+)?/.+.jpg$ /img/p/$1/$2/$3/$4/$5/$6/$1$2$3$4$5$6$7$8.jpg last; + rewrite ^/([0-9])([0-9])([0-9])([0-9])([0-9])([0-9])([0-9])(-[_a-zA-Z0-9-]*)?(-[0-9]+)?/.+.jpg$ /img/p/$1/$2/$3/$4/$5/$6/$7/$1$2$3$4$5$6$7$8$9.jpg last; + rewrite ^/([0-9])([0-9])([0-9])([0-9])([0-9])([0-9])([0-9])([0-9])(-[_a-zA-Z0-9-]*)?(-[0-9]+)?/.+.jpg$ /img/p/$1/$2/$3/$4/$5/$6/$7/$8/$1$2$3$4$5$6$7$8$9$10.jpg last; + rewrite ^/c/([0-9]+)(-[.*_a-zA-Z0-9-]*)(-[0-9]+)?/.+.jpg$ /img/c/$1$2$3.jpg last; + rewrite ^/c/([a-zA-Z_-]+)(-[0-9]+)?/.+.jpg$ /img/c/$1$2.jpg last; + + error_page 404 /index.php?controller=404; + + # Deny access to .htaccess .DS_Store .htpasswd etc + location ~ /\. { + deny all; + } +data-enpassusermodified="yes" + # Deny access file theme + location ~ \.tpl { + deny all; + } + + location ~* \.(css|js|docx|zip|pptx|swf|txt|jpg|jpeg|png|gif|swf|webp|flv|ico|pdf|avi|mov|ppt|doc|mp3|wmv|wav|mp4|m4v|ogg|webm|aac)$ { + expires max; + log_not_found off; + more_set_headers "Pragma: public"; + more_set_headers "Cache-Control: public; must-revalidate; proxy-revalidate"; + } - 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 index.php; + fastcgi_index index.php; include fastcgi_params; - - include /etc/nginx/fastcgi_params; - fastcgi_intercept_errors on; fastcgi_param REMOTE_USER $remote_user; fastcgi_param PATH_INFO $fastcgi_path_info; fastcgi_param SCRIPT_FILENAME $request_filename; - - #fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; + + fastcgi_keep_conn on; + fastcgi_intercept_errors on; + fastcgi_max_temp_file_size 0; + fastcgi_temp_file_write_size 256k; + fastcgi_buffer_size 8k; + fastcgi_buffers 64 8k; + fastcgi_busy_buffers_size 8k; + fastcgi_connect_timeout 300; + fastcgi_read_timeout 300; + fastcgi_send_timeout 300; + client_max_body_size 30m; } # Include SSOWAT user panel.