From 736b3494d838f085646a1216cf0ae5bb09f71525 Mon Sep 17 00:00:00 2001 From: dkuji Date: Mon, 15 Apr 2024 12:55:59 +0900 Subject: [PATCH] fix ssl params semicolon in zabbix_web (#1206) --- changelogs/fragments/1206-fix-nginx-template-ssl-params.yml | 2 ++ roles/zabbix_web/templates/nginx_vhost.conf.j2 | 6 +++--- 2 files changed, 5 insertions(+), 3 deletions(-) create mode 100644 changelogs/fragments/1206-fix-nginx-template-ssl-params.yml diff --git a/changelogs/fragments/1206-fix-nginx-template-ssl-params.yml b/changelogs/fragments/1206-fix-nginx-template-ssl-params.yml new file mode 100644 index 000000000..a75da9453 --- /dev/null +++ b/changelogs/fragments/1206-fix-nginx-template-ssl-params.yml @@ -0,0 +1,2 @@ +bugfixes: + - zabbix_web - Added missing semicolon to nginx vhost template. diff --git a/roles/zabbix_web/templates/nginx_vhost.conf.j2 b/roles/zabbix_web/templates/nginx_vhost.conf.j2 index dc8cc1635..c04a0712c 100644 --- a/roles/zabbix_web/templates/nginx_vhost.conf.j2 +++ b/roles/zabbix_web/templates/nginx_vhost.conf.j2 @@ -70,9 +70,9 @@ server { ssl_certificate {{ zabbix_web_tls_crt }}; ssl_certificate_key {{ zabbix_web_tls_key }}; - {{ (zabbix_web_ssl_cipher_suite is defined and zabbix_web_ssl_cipher_suite is not none) | ternary('', '# ') }}ssl_ciphers {{ zabbix_web_ssl_cipher_suite | default('') }} - {{ (zabbix_web_SSLSessionCache is defined and zabbix_web_SSLSessionCache is not none) | ternary('', '# ') }}ssl_session_cache {{ zabbix_web_SSLSessionCache | default('') }} - {{ (zabbix_web_SSLSessionCacheTimeout is defined and zabbix_web_SSLSessionCacheTimeout is not none) | ternary('', '# ') }}ssl_session_timeout {{ zabbix_web_SSLSessionCacheTimeout | default('') }} + {{ (zabbix_web_ssl_cipher_suite is defined and zabbix_web_ssl_cipher_suite is not none) | ternary('', '# ') }}ssl_ciphers {{ zabbix_web_ssl_cipher_suite | default('') }}; + {{ (zabbix_web_SSLSessionCache is defined and zabbix_web_SSLSessionCache is not none) | ternary('', '# ') }}ssl_session_cache {{ zabbix_web_SSLSessionCache | default('') }}; + {{ (zabbix_web_SSLSessionCacheTimeout is defined and zabbix_web_SSLSessionCacheTimeout is not none) | ternary('', '# ') }}ssl_session_timeout {{ zabbix_web_SSLSessionCacheTimeout | default('') }}; root /usr/share/zabbix; index index.php;