D3367.diff
No OneTemporary
Actions

Size

1 KB

Referenced Files

None

Subscribers

None

D3367.diff
View Options

	diff --git a/roles/webserver-core/nginx/config.sls b/roles/webserver-core/nginx/config.sls
	--- a/roles/webserver-core/nginx/config.sls
	+++ b/roles/webserver-core/nginx/config.sls
	@@ -55,6 +55,7 @@
	- file_mode: 644
	- template: jinja
	- context:
	+ nginx_version: {{ salt["nginx.version"]() }}
	nginx_dir: {{ dirs.etc }}/nginx
	nginx_options: {{ options }}
	certbot_dir: {{ certbot_dir }}
	diff --git a/roles/webserver-core/nginx/files/includes/tls b/roles/webserver-core/nginx/files/includes/tls
	--- a/roles/webserver-core/nginx/files/includes/tls
	+++ b/roles/webserver-core/nginx/files/includes/tls
	@@ -16,8 +16,14 @@
	# and will be lost if the state is redeployed.
	# </auto-generated>

	+{% if salt["pkg.version_cmp"](nginx_version, "1.25.1") >= 0 -%}
	+listen 443 ssl;
	+listen [::]:443 ssl;
	+http2 on;
	+{%- else -%}
	listen 443 ssl http2;
	listen [::]:443 ssl http2;
	+{%- endif %}

	keepalive_timeout 70;

	diff --git a/roles/webserver-core/nginx/files/includes/tls-modern-only b/roles/webserver-core/nginx/files/includes/tls-modern-only
	--- a/roles/webserver-core/nginx/files/includes/tls-modern-only
	+++ b/roles/webserver-core/nginx/files/includes/tls-modern-only
	@@ -16,8 +16,14 @@
	# and will be lost if the state is redeployed.
	# </auto-generated>

	+{% if salt["pkg.version_cmp"](nginx_version, "1.25.1") >= 0 -%}
	+listen 443 ssl;
	+listen [::]:443 ssl;
	+http2 on;
	+{%- else -%}
	listen 443 ssl http2;
	listen [::]:443 ssl http2;
	+{%- endif %}

	keepalive_timeout 70;