From 4278da7887467ee5e4c7694604cfa59adab38418 Mon Sep 17 00:00:00 2001
From: Marcin Siodelski <marcin@isc.org>
Date: Mon, 6 Sep 2021 16:44:13 +0200
Subject: [PATCH 1/2] [#557] Adjusted nginx conf file

Updated nginx configuration forwards calls to /stork-install-agent.sh to
the Stork server.
---
 etc/nginx-stork.conf | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/etc/nginx-stork.conf b/etc/nginx-stork.conf
index 2df572c72..659559cda 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 / {
-- 
GitLab


From 4bc0b078743fed06c9fc69552468bed63902520a Mon Sep 17 00:00:00 2001
From: Marcin Siodelski <marcin@isc.org>
Date: Mon, 6 Sep 2021 19:13:05 +0200
Subject: [PATCH 2/2] [#557] Added ChangeLog for #557

---
 ChangeLog.md | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/ChangeLog.md b/ChangeLog.md
index 7bdf61b2c..c93a361ee 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
-- 
GitLab