diff --git a/ChangeLog.md b/ChangeLog.md index 7bdf61b2c3cdd492656562eb1980cf855d14f4a3..c93a361eede0612544389c1b31ed9c96ca2f4fe0 100644 --- a/ChangeLog.md +++ b/ChangeLog.md @@ -1,3 +1,13 @@ +* 158 [build] marcin + + Corrected issues with the nginx-server.conf, an example Nginx + configuration file providing the reverse proxy setup for Stork. + The proxy now correctly forwards calls to download the Stork + Agent installation script. The updated configuration also + allows for accurately determining the Stork server URL while + generating the downloaded script. + (Gitlab #557) + * 157 [func] godfryd, slawek Added cert-import command to stork-tool. This allows diff --git a/etc/nginx-stork.conf b/etc/nginx-stork.conf index 2df572c7236e7d2a6acb0bbdf41cd949f7bc3d46..659559cdacd268c515c60861e4cac01392ca6f08 100644 --- a/etc/nginx-stork.conf +++ b/etc/nginx-stork.conf @@ -13,6 +13,7 @@ server { proxy_next_upstream error timeout invalid_header http_500 http_502 http_503 http_504; proxy_buffering off; proxy_set_header Accept-Encoding ""; + proxy_set_header Host $host; } location /swagger.json { @@ -20,6 +21,15 @@ server { proxy_next_upstream error timeout invalid_header http_500 http_502 http_503 http_504; proxy_buffering off; proxy_set_header Accept-Encoding ""; + proxy_set_header Host $host; + } + + location /stork-install-agent.sh { + proxy_pass http://ui_rest; + proxy_next_upstream error timeout invalid_header http_500 http_502 http_503 http_504; + proxy_buffering off; + proxy_set_header Accept-Encoding ""; + proxy_set_header Host $host; } location / {