Skip to content

Commit 739d66f

Browse files
author
Kristan Kenney
committed
Merge branch 'bugfix-nginx-conf' into develop
2 parents 180e0cb + c7c3664 commit 739d66f

File tree

2 files changed

+2
-2
lines changed

2 files changed

+2
-2
lines changed

install/deb/nginx/nginx.conf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,6 @@ http {
6262
log_format bytes '$body_bytes_sent';
6363
log_not_found off;
6464
access_log off;
65-
#access_log /var/log/nginx/access.log main;
6665

6766
# Mime settings
6867
include /etc/nginx/mime.types;
@@ -105,6 +104,7 @@ http {
105104

106105
# SSL PCI compliance
107106
ssl_session_cache shared:SSL:20m;
107+
ssl_session_timeout 60m;
108108
ssl_buffer_size 1400;
109109
ssl_protocols TLSv1.1 TLSv1.2 TLSv1.3;
110110
ssl_prefer_server_ciphers on;

src/deb/nginx/nginx.conf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -77,8 +77,8 @@ http {
7777

7878
# SSL PCI compliance
7979
ssl_session_cache shared:SSL:10m;
80-
ssl_buffer_size 1400;
8180
ssl_session_timeout 60m;
81+
ssl_buffer_size 1400;
8282
ssl_protocols TLSv1.1 TLSv1.2 TLSv1.3;
8383
ssl_prefer_server_ciphers on;
8484
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";

0 commit comments

Comments
 (0)