Skip to content

St2web - Resolve upstream hosts every second #30

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

Closed
winem wants to merge 2 commits into from
Closed

St2web - Resolve upstream hosts every second #30

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8f35948
Update st2web http and https conf patch to resolve upstream hosts eve…
winem May 10, 2020
af6292b
st2web - trying to fix the circle-ci failure when applying the http p…
winem May 10, 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
33 changes: 20 additions & 13 deletions st2web/files/st2.conf-http.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
--- /etc/nginx/conf.d/st2.template 2019-05-27 14:11:20.000000000 -0700
+++ /etc/nginx/conf.d/st2.conf 2019-05-27 14:22:28.000000000 -0700
--- /etc/nginx/conf.d/st2.template 2020-05-10 02:12:53.977869285 +0200
+++ /etc/nginx/conf.d/st2.conf 2020-05-10 02:13:07.373975299 +0200
@@ -1,6 +1,6 @@
#
-# nginx configuration to expose st2 webui, redirect HTTP->HTTPS,
Expand All @@ -9,7 +9,7 @@
# To enable:
# cp ${LOCATION}/st2.conf /etc/nginx/sites-available
# ln -l /etc/nginx/sites-available/st2.conf /etc/nginx/sites-enabled/st2.conf
@@ -9,37 +9,12 @@
@@ -9,37 +9,14 @@
server {
listen *:80 default_server;

Expand Down Expand Up @@ -41,42 +41,49 @@

- access_log /var/log/nginx/ssl-st2webui.access.log combined;
- error_log /var/log/nginx/ssl-st2webui.error.log;
-
- add_header Front-End-Https on;
- add_header X-Content-Type-Options nosniff;
+ access_log /proc/self/fd/1 combined;
+ error_log stderr;

- add_header Front-End-Https on;
- add_header X-Content-Type-Options nosniff;
+ resolver 127.0.0.11 valid=1s;

location @apiError {
add_header Content-Type application/json always;
@@ -51,7 +24,7 @@
@@ -51,7 +28,9 @@

rewrite ^/api/(.*) /$1 break;

- proxy_pass http://127.0.0.1:9101/;
+ proxy_pass ${ST2_API_URL};
+ set api_upstream ${ST2_API_URL};
+
+ proxy_pass $api_upstream;
proxy_read_timeout 90;
proxy_connect_timeout 90;
proxy_redirect off;
@@ -81,7 +54,7 @@
@@ -81,7 +60,9 @@

rewrite ^/stream/(.*) /$1 break;

- proxy_pass http://127.0.0.1:9102/;
+ proxy_pass ${ST2_STREAM_URL};
+ set stream_upstream ${ST2_STREAM_URL};
+
+ proxy_pass $stream_upstream;
proxy_set_header Host $host;
proxy_set_header X-Real-IP $remote_addr;
proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
@@ -109,7 +82,7 @@
@@ -109,7 +90,9 @@

rewrite ^/auth/(.*) /$1 break;

- proxy_pass http://127.0.0.1:9100/;
+ proxy_pass ${ST2_AUTH_URL};
+ set auth_upstream ${ST2_AUTH_URL};
+
+ proxy_pass $auth_upstream;
proxy_read_timeout 90;
proxy_connect_timeout 90;
proxy_redirect off;
@@ -134,4 +107,5 @@
@@ -134,4 +117,5 @@
tcp_nopush on;
tcp_nodelay on;
}
Expand Down
30 changes: 21 additions & 9 deletions st2web/files/st2.conf-https.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
--- /etc/nginx/conf.d/st2.template 2019-05-27 14:11:20.000000000 -0700
+++ /etc/nginx/conf.d/st2.conf 2019-05-27 14:22:11.000000000 -0700
--- /etc/nginx/conf.d/st2.template 2020-05-10 02:12:53.977869285 +0200
+++ /etc/nginx/conf.d/st2.conf 2020-05-10 02:17:47.307939010 +0200
@@ -18,8 +18,8 @@

index index.html;
Expand All @@ -11,7 +11,7 @@
}

server {
@@ -35,8 +35,8 @@
@@ -35,12 +35,14 @@

index index.html;

Expand All @@ -22,30 +22,42 @@

add_header Front-End-Https on;
add_header X-Content-Type-Options nosniff;
@@ -51,7 +51,7 @@

+ resolver 127.0.0.11 valid=1s;
+
location @apiError {
add_header Content-Type application/json always;
return 503 '{ "faultstring": "Nginx is unable to reach st2api. Make sure service is running." }';
@@ -51,7 +53,9 @@

rewrite ^/api/(.*) /$1 break;

- proxy_pass http://127.0.0.1:9101/;
+ proxy_pass ${ST2_API_URL};
+ set api_upstream ${ST2_API_URL};
+
+ proxy_pass $api_upstream;
proxy_read_timeout 90;
proxy_connect_timeout 90;
proxy_redirect off;
@@ -81,7 +81,7 @@
@@ -81,7 +85,9 @@

rewrite ^/stream/(.*) /$1 break;

- proxy_pass http://127.0.0.1:9102/;
+ proxy_pass ${ST2_STREAM_URL};
+ set stream_upstream ${ST2_STREAM_URL};
+
+ proxy_pass $stream_upstream;
proxy_set_header Host $host;
proxy_set_header X-Real-IP $remote_addr;
proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
@@ -109,7 +109,7 @@
@@ -109,7 +115,9 @@

rewrite ^/auth/(.*) /$1 break;

- proxy_pass http://127.0.0.1:9100/;
+ proxy_pass ${ST2_AUTH_URL};
+ set auth_upstream ${ST2_AUTH_URL};
+
+ proxy_pass $auth_upstream;
proxy_read_timeout 90;
proxy_connect_timeout 90;
proxy_redirect off;