Skip to content

remove deprecated ssl and duplicate proxy host header #4966

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 4 commits into from
Jun 17, 2020
Merged

remove deprecated ssl and duplicate proxy host header #4966

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
9893139
remove deprecated ssl and duplicate proxy host header
punkrokk Jun 12, 2020
eecdfe9
remove ssl-on
punkrokk Jun 12, 2020
4ae57d0
update changelog
punkrokk Jun 12, 2020
679ca94
Merge branch 'master' into update-HA-nginx
punkrokk Jun 12, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions CHANGELOG.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
----------------------
Expand Down
2 changes: 0 additions & 2 deletions conf/HA/nginx/st2.conf.blueprint.sample
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
5 changes: 0 additions & 5 deletions conf/HA/nginx/st2.conf.controller.sample
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -70,7 +68,6 @@ server {
chunked_transfer_encoding off;
proxy_buffering off;
proxy_cache off;
proxy_set_header Host $host;
}

location @streamError {
Expand Down Expand Up @@ -127,7 +124,6 @@ server {
chunked_transfer_encoding off;
proxy_buffering off;
proxy_cache off;
proxy_set_header Host $host;
}

location /mistral/ {
Expand All @@ -146,7 +142,6 @@ server {
chunked_transfer_encoding off;
proxy_buffering off;
proxy_cache off;
proxy_set_header Host $host;
}

location / {
Expand Down