Просмотр исходного кода

Merge branch 'bugfix-nginx-conf' into develop

Kristan Kenney 6 лет назад
Родитель
Сommit
739d66f05a
2 измененных файлов с 2 добавлено и 2 удалено
  1. 1 1
      install/deb/nginx/nginx.conf
  2. 1 1
      src/deb/nginx/nginx.conf

+ 1 - 1
install/deb/nginx/nginx.conf

@@ -62,7 +62,6 @@ http {
     log_format  bytes   '$body_bytes_sent';
     log_not_found off;
     access_log off;
-    #access_log         /var/log/nginx/access.log main;
 
     # Mime settings
     include             /etc/nginx/mime.types;
@@ -105,6 +104,7 @@ http {
 
     # SSL PCI compliance
     ssl_session_cache   shared:SSL:20m;
+    ssl_session_timeout 60m;
     ssl_buffer_size     1400;
     ssl_protocols       TLSv1.1 TLSv1.2 TLSv1.3;
     ssl_prefer_server_ciphers on;

+ 1 - 1
src/deb/nginx/nginx.conf

@@ -77,8 +77,8 @@ http {
 
     # SSL PCI compliance
     ssl_session_cache   shared:SSL:10m;
-    ssl_buffer_size     1400;
     ssl_session_timeout 60m;
+    ssl_buffer_size     1400;
     ssl_protocols       TLSv1.1 TLSv1.2 TLSv1.3;
     ssl_prefer_server_ciphers on;
     ssl_ciphers         "ECDHE-ECDSA-CHACHA20-POLY1305:ECDHE-RSA-CHACHA20-POLY1305:ECDHE-ECDSA-AES128-GCM-SHA256:ECDHE-RSA-AES128-GCM-SHA256:ECDHE-ECDSA-AES256-GCM-SHA384:ECDHE-RSA-AES256-GCM-SHA384:DHE-RSA-AES128-GCM-SHA256:DHE-RSA-AES256-GCM-SHA384:ECDHE-ECDSA-AES128-SHA256:ECDHE-RSA-AES128-SHA256:ECDHE-ECDSA-AES128-SHA:ECDHE-RSA-AES256-SHA384:ECDHE-RSA-AES128-SHA:ECDHE-ECDSA-AES256-SHA384:ECDHE-ECDSA-AES256-SHA:ECDHE-RSA-AES256-SHA:DHE-RSA-AES128-SHA256:DHE-RSA-AES128-SHA:DHE-RSA-AES256-SHA256:DHE-RSA-AES256-SHA:ECDHE-ECDSA-DES-CBC3-SHA:ECDHE-RSA-DES-CBC3-SHA:EDH-RSA-DES-CBC3-SHA:AES128-GCM-SHA256:AES256-GCM-SHA384:AES128-SHA256:AES256-SHA256:AES128-SHA:AES256-SHA:DES-CBC3-SHA:!DSS";