diff --git a/salt/nginx/etc/nginx.conf b/salt/nginx/etc/nginx.conf index 72ba07b89..1c77426ef 100644 --- a/salt/nginx/etc/nginx.conf +++ b/salt/nginx/etc/nginx.conf @@ -84,7 +84,8 @@ http { } server { - listen 443 ssl http2 default_server; + listen 443 ssl default_server; + http2 on; server_name _; return 307 https://{{ GLOBALS.url_base }}$request_uri; @@ -118,17 +119,10 @@ http { } {%- if NGINXMERGED.external_suricata %} server { - listen 7789 ssl http2; + listen 7789 ssl; + http2 on; server_name {{ GLOBALS.url_base }}; root /surirules; - location / { - allow all; - sendfile on; - sendfile_max_chunk 1m; - autoindex on; - autoindex_exact_size off; - autoindex_format html; - autoindex_localtime on; ssl_certificate "/etc/pki/nginx/server.crt"; ssl_certificate_key "/etc/pki/nginx/server.key"; ssl_session_cache shared:SSL:1m; @@ -136,12 +130,21 @@ http { ssl_ciphers HIGH:!aNULL:!MD5; ssl_prefer_server_ciphers on; ssl_protocols TLSv1.2; + location / { + allow all; + sendfile on; + sendfile_max_chunk 1m; + autoindex on; + autoindex_exact_size off; + autoindex_format html; + autoindex_localtime on; } } {%- endif %} server { - listen 443 ssl http2; + listen 443 ssl; + http2 on; server_name {{ GLOBALS.url_base }}; root /opt/socore/html; index index.html;