diff --git a/etc/nginx/conf.d/fastcgi.conf b/etc/nginx/conf.d/fastcgi.conf index 1490043..b8b9547 100644 --- a/etc/nginx/conf.d/fastcgi.conf +++ b/etc/nginx/conf.d/fastcgi.conf @@ -15,8 +15,9 @@ fastcgi_ignore_headers Cache-Control Expires Set-Cookie; fastcgi_keep_conn on; fastcgi_intercept_errors on; fastcgi_cache_background_update on; -fastcgi_socket_keepalive on; fastcgi_cache_lock on; fastcgi_cache_lock_age 1s; fastcgi_cache_lock_timeout 3s; +# comment the following line if you run nginx < 1.15.6 +fastcgi_socket_keepalive on; diff --git a/etc/nginx/conf.d/upstream.conf b/etc/nginx/conf.d/upstream.conf index f267915..4061517 100644 --- a/etc/nginx/conf.d/upstream.conf +++ b/etc/nginx/conf.d/upstream.conf @@ -1,5 +1,5 @@ # Common upstream settings -# replace php5.6 and php7.0 by php7.2 +# php5.6 & php7.0 are replaced by php7.2 ################## # php5.6-fpm diff --git a/etc/nginx/sites-available/22222 b/etc/nginx/sites-available/22222 index 058c406..f99573c 100644 --- a/etc/nginx/sites-available/22222 +++ b/etc/nginx/sites-available/22222 @@ -1,73 +1,62 @@ # EasyEngine admin NGINX CONFIGURATION - server { - listen 22222 default_server ssl http2; + listen 22222 default_server ssl http2; - access_log off; - error_log /var/log/nginx/22222.error.log; + access_log off; + error_log /var/log/nginx/22222.error.log; - ssl_certificate /var/www/22222/cert/22222.crt; - ssl_certificate_key /var/www/22222/cert/22222.key; + ssl_certificate /var/www/22222/cert/22222.crt; + ssl_certificate_key /var/www/22222/cert/22222.key; - # Force HTTP to HTTPS - error_page 497 =200 https://$host:22222$request_uri; +# Force HTTP to HTTPS + error_page 497 =200 https://$host:22222$request_uri; - root /var/www/22222/htdocs; - index index.php index.htm index.html; + root /var/www/22222/htdocs; + index index.php index.htm index.html; - # Turn on directory listing - autoindex on; +# Turn on directory listing + autoindex on; +# HTTP Authentication on port 22222 + include common/acl.conf; - # HTTP Authentication on port 22222 - include common/acl.conf; - - location / { - try_files $uri $uri/ /index.php$is_args$args; - } - - # nginx-vts-status - location /vts_status { - vhost_traffic_status_display; - vhost_traffic_status_display_format html; - } - - # Display menu at location /fpm/status/ - location = /fpm/status/ {} - - location ~ /fpm/status/(.*) { - try_files $uri =404; - include fastcgi_params; - fastcgi_param SCRIPT_NAME /status; - fastcgi_pass $1; - } - - location ~ \.php$ { - try_files $uri =404; - include fastcgi_params; - fastcgi_pass php72; - } - - location /netdata { + location / { + try_files $uri $uri/ /index.php$is_args$args; + } +# nginx-vts-status + location /vts_status { + vhost_traffic_status_display; + vhost_traffic_status_display_format html; + } +# Display menu at location /fpm/status/ + location = /fpm/status/; + location ~ /fpm/status/(.*) { + try_files $uri =404; + include fastcgi_params; + fastcgi_param SCRIPT_NAME /status; + fastcgi_pass $1; + } + location ~ \.php$ { + try_files $uri =404; + include fastcgi_params; + fastcgi_pass php72; + } + location /netdata { return 301 /netdata/; - } - - location ~ /netdata/(?.*) { + } + location ~ /netdata/(?.*) { proxy_redirect off; proxy_set_header Host $host; - proxy_set_header X-Forwarded-Host $host; proxy_set_header X-Forwarded-Server $host; proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; + proxy_set_header Connection "keep-alive"; proxy_http_version 1.1; proxy_pass_request_headers on; - proxy_set_header Connection "keep-alive"; proxy_store off; proxy_pass http://netdata/$ndpath$is_args$args; - gzip on; gzip_proxied any; gzip_types *; } - } diff --git a/etc/php/7.0/pool.d/www-sock.conf b/etc/php/7.0/fpm/pool.d/www-sock.conf similarity index 100% rename from etc/php/7.0/pool.d/www-sock.conf rename to etc/php/7.0/fpm/pool.d/www-sock.conf diff --git a/etc/php/7.0/pool.d/www-two-sock..conf b/etc/php/7.0/fpm/pool.d/www-two-sock.conf similarity index 100% rename from etc/php/7.0/pool.d/www-two-sock..conf rename to etc/php/7.0/fpm/pool.d/www-two-sock.conf diff --git a/etc/php/7.1/fpm/pool.d/www-two-sock..conf b/etc/php/7.1/fpm/pool.d/www-two-sock.conf similarity index 100% rename from etc/php/7.1/fpm/pool.d/www-two-sock..conf rename to etc/php/7.1/fpm/pool.d/www-two-sock.conf diff --git a/etc/php/7.2/fpm/pool.d/www-two-sock..conf b/etc/php/7.2/fpm/pool.d/www-two-sock.conf similarity index 100% rename from etc/php/7.2/fpm/pool.d/www-two-sock..conf rename to etc/php/7.2/fpm/pool.d/www-two-sock.conf diff --git a/etc/php/7.3/fpm/pool.d/www-two-sock..conf b/etc/php/7.3/fpm/pool.d/www-two-sock.conf similarity index 100% rename from etc/php/7.3/fpm/pool.d/www-two-sock..conf rename to etc/php/7.3/fpm/pool.d/www-two-sock.conf