From b036ab25be209d9bb4805c91f20ae7edbec51f74 Mon Sep 17 00:00:00 2001 From: dkuji Date: Sun, 14 Apr 2024 00:54:09 +0900 Subject: [PATCH 1/2] fix zabbix_web ssl params semicolon --- roles/zabbix_web/templates/nginx_vhost.conf.j2 | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) 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; From eb36853482560393e15c82db9a438f4f9c57aeaa Mon Sep 17 00:00:00 2001 From: dkuji Date: Sun, 14 Apr 2024 21:18:35 +0900 Subject: [PATCH 2/2] Add chagelog --- changelogs/fragments/1206-fix-nginx-template-ssl-params.yml | 2 ++ 1 file changed, 2 insertions(+) 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.