From 98931392aa295ccd37b20f9e7290bc30e232a8b4 Mon Sep 17 00:00:00 2001 From: JP Bourget Date: Fri, 12 Jun 2020 09:58:07 -0400 Subject: [PATCH 1/3] remove deprecated ssl and duplicate proxy host header --- conf/HA/nginx/st2.conf.controller.sample | 5 ----- 1 file changed, 5 deletions(-) diff --git a/conf/HA/nginx/st2.conf.controller.sample b/conf/HA/nginx/st2.conf.controller.sample index a82dc16aa7..afb98b6d60 100644 --- a/conf/HA/nginx/st2.conf.controller.sample +++ b/conf/HA/nginx/st2.conf.controller.sample @@ -30,8 +30,6 @@ server { server { listen *:443 ssl; - ssl on; - ssl_certificate /etc/ssl/st2/st2.crt; ssl_certificate_key /etc/ssl/st2/st2.key; ssl_session_cache shared:SSL:10m; @@ -70,7 +68,6 @@ server { chunked_transfer_encoding off; proxy_buffering off; proxy_cache off; - proxy_set_header Host $host; } location @streamError { @@ -127,7 +124,6 @@ server { chunked_transfer_encoding off; proxy_buffering off; proxy_cache off; - proxy_set_header Host $host; } location /mistral/ { @@ -146,7 +142,6 @@ server { chunked_transfer_encoding off; proxy_buffering off; proxy_cache off; - proxy_set_header Host $host; } location / { From eecdfe9ebb8e89e02b786348e8ccbda9ecfb90d7 Mon Sep 17 00:00:00 2001 From: JP Bourget Date: Fri, 12 Jun 2020 09:59:30 -0400 Subject: [PATCH 2/3] remove ssl-on --- conf/HA/nginx/st2.conf.blueprint.sample | 2 -- 1 file changed, 2 deletions(-) diff --git a/conf/HA/nginx/st2.conf.blueprint.sample b/conf/HA/nginx/st2.conf.blueprint.sample index beb32cce87..7e37186cc6 100644 --- a/conf/HA/nginx/st2.conf.blueprint.sample +++ b/conf/HA/nginx/st2.conf.blueprint.sample @@ -25,8 +25,6 @@ server { server { listen *:443 ssl; - ssl on; - ssl_certificate /etc/ssl/st2/st2.crt; ssl_certificate_key /etc/ssl/st2/st2.key; ssl_session_cache shared:SSL:10m; From 4ae57d0da3b467309d11ec62546d90501ed85920 Mon Sep 17 00:00:00 2001 From: JP Bourget Date: Fri, 12 Jun 2020 13:35:21 -0400 Subject: [PATCH 3/3] update changelog --- CHANGELOG.rst | 2 ++ 1 file changed, 2 insertions(+) diff --git a/CHANGELOG.rst b/CHANGELOG.rst index 12e75aa25f..a4c5d2232e 100644 --- a/CHANGELOG.rst +++ b/CHANGELOG.rst @@ -27,6 +27,8 @@ Fixed * Fix a bug where passing an empty list to a with items task in a subworkflow causes the parent workflow to be stuck in running status. (bug fix) #4954 +* Fixed a bug in the example nginx HA template declared headers twice (bug fix) #4966 + Contributed by @punkrokk 3.2.0 - April 27, 2020 ----------------------