diff --git a/docker-compose.yml b/docker-compose.yml index 98e93884..9ae4f02f 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -24,7 +24,6 @@ services: dockerfile: ./docker/php/Dockerfile volumes: - ./:/code - - ./docker/php/custom.ini:/usr/local/etc/php/conf.d/custom.ini - ./docker/php/www.conf:/usr/local/etc/php-fpm.d/www.conf networks: leftchan_net: diff --git a/docker/nginx/leftypol.conf b/docker/nginx/leftypol.conf index a825fea7..eada8ee9 100644 --- a/docker/nginx/leftypol.conf +++ b/docker/nginx/leftypol.conf @@ -1,68 +1,66 @@ upstream php-upstream { - server php:9000; + server php:9000; } server { - listen 80 default_server; - listen [::]:80 default_server ipv6only=on; - server_name leftypol; - root /var/www-leftypol; - add_header X-Frame-Options "SAMEORIGIN"; - add_header X-Content-Type-Options "nosniff"; + listen 80 default_server; + listen [::]:80 default_server ipv6only=on; + server_name leftypol; + root /var/www-leftypol; + add_header X-Frame-Options "SAMEORIGIN"; + add_header X-Content-Type-Options "nosniff"; - index index.html index.php; + index index.html index.php; - charset utf-8; + charset utf-8; - location ~ ^([^.\?]*[^\/])$ { - try_files $uri @addslash; - } + location ~ ^([^.\?]*[^\/])$ { + try_files $uri @addslash; + } - # Expire rules for static content - # Media: images, icons, video, audio, HTC - location ~* \.(?:jpg|jpeg|gif|png|ico|cur|gz|svg|svgz|mp4|ogg|ogv|webm|htc)$ { - expires 1M; - access_log off; - log_not_found off; - add_header Cache-Control "public"; - } - # CSS and Javascript - location ~* \.(?:css|js)$ { - expires 1y; - access_log off; - log_not_found off; - add_header Cache-Control "public"; - } + # Expire rules for static content + # Media: images, icons, video, audio, HTC + location ~* \.(?:jpg|jpeg|gif|png|ico|cur|gz|svg|svgz|mp4|ogg|ogv|webm|htc)$ { + expires 1M; + access_log off; + log_not_found off; + add_header Cache-Control "public"; + } + # CSS and Javascript + location ~* \.(?:css|js)$ { + expires 1y; + access_log off; + log_not_found off; + add_header Cache-Control "public"; + } - location ~* \.(html)$ { - expires -1; - } + location ~* \.(html)$ { + expires -1; + } - location @addslash { - return 301 $uri/; - } + location @addslash { + return 301 $uri/; + } - location / { - try_files $uri $uri/ /index.php$is_args$args; - } + location / { + try_files $uri $uri/ /index.php$is_args$args; + } - client_max_body_size 2G; + client_max_body_size 2G; - location ~ \.php$ { - proxy_set_header X-Real-IP $remote_addr; - proxy_set_header X-Forwarded-For $remote_addr; - proxy_set_header X-Request-Id $x_request_id; - proxy_set_header X-Forwarded-Host $host; - proxy_set_header Forwarded-Request-Id $x_request_id; - fastcgi_pass php-upstream; - fastcgi_index index.php; - fastcgi_buffers 16 16k; - fastcgi_buffer_size 32k; - fastcgi_param SCRIPT_FILENAME $realpath_root$fastcgi_script_name; - fastcgi_read_timeout 600; - include fastcgi_params; - } + location ~ \.php$ { + proxy_set_header X-Real-IP $remote_addr; + proxy_set_header X-Forwarded-For $remote_addr; + proxy_set_header X-Request-Id $x_request_id; + proxy_set_header X-Forwarded-Host $host; + proxy_set_header Forwarded-Request-Id $x_request_id; + fastcgi_pass php-upstream; + fastcgi_index index.php; + fastcgi_param SCRIPT_FILENAME $realpath_root$fastcgi_script_name; + fastcgi_read_timeout 600; + include fastcgi_params; + } - location = /favicon.ico { access_log off; log_not_found off; } - location = /robots.txt { access_log off; log_not_found off; } + location = /favicon.ico { access_log off; log_not_found off; } + location = /robots.txt { access_log off; log_not_found off; } } \ No newline at end of file diff --git a/docker/nginx/nginx.conf b/docker/nginx/nginx.conf index 8a42dee3..8a4ba95f 100644 --- a/docker/nginx/nginx.conf +++ b/docker/nginx/nginx.conf @@ -2,32 +2,32 @@ # https://github.com/dead-guru/devichan/blob/master/nginx/nginx.conf user leftypol; -worker_processes 4; +worker_processes auto; # daemon off; # error_log /var/log/nginx/error.log warn; error_log /dev/stdout warn; pid /var/run/nginx.pid; events { - worker_connections 1024; + worker_connections 1024; } http { - include /etc/nginx/mime.types; - default_type application/octet-stream; - #access_log /var/log/nginx/access.log; - # Switch logging to console out to view via Docker - access_log /dev/stdout; - error_log /dev/stdout warn; - sendfile on; - keepalive_timeout 5; + include /etc/nginx/mime.types; + default_type application/octet-stream; + #access_log /var/log/nginx/access.log; + # Switch logging to console out to view via Docker + access_log /dev/stdout; + error_log /dev/stdout warn; + sendfile on; + keepalive_timeout 5; - gzip on; - gzip_http_version 1.0; - gzip_vary on; - gzip_comp_level 6; - gzip_types text/xml text/plain text/css application/xhtml+xml application/xml application/rss+xml application/atom_xml application/x-javascript application/x-httpd-php; - gzip_disable "MSIE [1-6]\."; + gzip on; + gzip_http_version 1.0; + gzip_vary on; + gzip_comp_level 6; + gzip_types text/xml text/plain text/css application/xhtml+xml application/xml application/rss+xml application/atom_xml application/x-javascript application/x-httpd-php; + gzip_disable "MSIE [1-6]\."; - include /etc/nginx/conf.d/*.conf; - include /etc/nginx/sites-available/*.conf; + include /etc/nginx/conf.d/*.conf; + include /etc/nginx/sites-available/*.conf; } \ No newline at end of file diff --git a/docker/php/custom.ini b/docker/php/custom.ini deleted file mode 100644 index 527f44e7..00000000 --- a/docker/php/custom.ini +++ /dev/null @@ -1,11 +0,0 @@ -; based on https://github.com/dead-guru/devichan/blob/master/php-fpm/custom.ini - -memory_limit = 2G -max_execution_time = 30 -upload_max_filesize = 2G -post_max_size = 2G -pm = dynamic -pm.max_children = 20 -pm.start_servers = 5 -pm.min_spare_servers = 3 -pm.max_spare_servers = 10 diff --git a/docker/php/www.conf b/docker/php/www.conf index f6c4f00e..07fa7c28 100644 --- a/docker/php/www.conf +++ b/docker/php/www.conf @@ -2,9 +2,8 @@ user = leftypol group = leftypol listen = 127.0.0.1:9000 -pm = dynamic -pm.max_children = 200 -pm.start_servers = 10 +pm = static +pm.max_children = 16 +pm.start_servers = 2 pm.min_spare_servers = 1 -pm.max_spare_servers = 20 -pm.max_requests = 20000 +pm.max_spare_servers = 3