From f1b34191b26e0e61dbe759f83c7336d3387df5c6 Mon Sep 17 00:00:00 2001
From: Fawzi Mohamed <fawzi.mohamed@fhi-berlin.mpg.de>
Date: Thu, 13 Dec 2018 13:40:33 +0100
Subject: [PATCH] prod -> dev backend
---
nginx-labtest-nomad.conf | 113 ++++++++++++++++++---------------------
1 file changed, 53 insertions(+), 60 deletions(-)
diff --git a/nginx-labtest-nomad.conf b/nginx-labtest-nomad.conf
index c63c0b8..b8f4e3d 100644
--- a/nginx-labtest-nomad.conf
+++ b/nginx-labtest-nomad.conf
@@ -115,7 +115,7 @@ http {
alias "/usr/share/nginx/html/.well-known/";
}
location /nexus/ {
- proxy_pass http://130.183.207.113:31629;
+ proxy_pass http://130.183.207.100:31542;
proxy_set_header Host $host;
proxy_set_header X-Real-IP $remote_addr;
proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
@@ -130,44 +130,41 @@ http {
}
location /userapi/ {
- proxy_pass https://130.183.207.113:30782;
+ proxy_pass https://130.183.207.100:30699;
}
location /api/ {
- proxy_pass http://130.183.207.113:32600;
+ proxy_pass http://130.183.207.100:30448;
}
location /ui/ {
- proxy_pass http://130.183.207.113:32600;
+ proxy_pass http://130.183.207.100:30448;
}
location /nmi/ {
- proxy_pass http://130.183.207.113:32600;
+ proxy_pass http://130.183.207.100:30448;
}
location /analytics/ {
- proxy_pass http://130.183.207.113:31842;
+ proxy_pass http://130.183.207.100:30155;
}
location /archive/ {
- proxy_pass http://130.183.207.113:31596;
+ proxy_pass http://130.183.207.100:31179;
}
- location /dev/ {
- proxy_pass http://130.183.207.113:31596;
- }
location /stats/ {
- proxy_pass http://130.183.207.113:31393;
+ proxy_pass http://130.183.207.100:31577;
}
location /apitest/ {
- proxy_pass http://130.183.207.113:31393;
+ proxy_pass http://130.183.207.100:31577;
}
location /jupyter/ {
- proxy_pass https://130.183.207.113:32141;
+ proxy_pass https://130.183.207.100:32213;
proxy_set_header Host $http_host;
proxy_set_header X-Real-IP $remote_addr;
proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
@@ -181,16 +178,16 @@ http {
}
location = /jupyter {
- proxy_pass https://130.183.207.113:32141;
+ proxy_pass https://130.183.207.100:32213;
proxy_set_header Host $host;
- proxy_set_header Origin https://130.183.207.113:32141;
+ proxy_set_header Origin https://130.183.207.100:32213;
proxy_set_header X-Real-IP $remote_addr;
proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
proxy_set_header X-Forwarded-Proto "https";
}
location ~ "^/jupyter/api/kernels/" {
- proxy_pass https://130.183.207.113:32141;
+ proxy_pass https://130.183.207.100:32213;
proxy_set_header Host $host;
# websocket support
proxy_http_version 1.1;
@@ -202,7 +199,7 @@ http {
proxy_set_header X-Forwarded-Proto "https";
}
location ~ "^/jupyter/terminals/" {
- proxy_pass https://130.183.207.113:32141;
+ proxy_pass https://130.183.207.100:32213;
proxy_set_header Host $host;
# websocket support
proxy_http_version 1.1;
@@ -227,37 +224,37 @@ http {
}
location /Creedo/ {
- proxy_pass https://130.183.207.113:31833;
+ proxy_pass https://130.183.207.100:30792;
}
rewrite "^/notebook-edit/(.*)$" /beaker/cM/start/$1 last;
location = /Shibboleth.sso {
- proxy_pass https://130.183.207.113:31548;
+ proxy_pass https://130.183.207.100:31880;
}
location /Shibboleth.sso/ {
- proxy_pass https://130.183.207.113:31548;
+ proxy_pass https://130.183.207.100:31880;
}
location = /shibboleth {
- proxy_pass https://130.183.207.113:31548;
+ proxy_pass https://130.183.207.100:31880;
}
location /shibboleth/ {
- proxy_pass https://130.183.207.113:31548;
+ proxy_pass https://130.183.207.100:31880;
}
location = /login {
proxy_set_header Host analytics-toolkit.nomad-coe.eu;
- proxy_set_header Origin https://130.183.207.113:31548;
- proxy_pass https://130.183.207.113:31548;
+ proxy_set_header Origin https://130.183.207.100:31880;
+ proxy_pass https://130.183.207.100:31880;
}
location /login/ {
proxy_set_header Host analytics-toolkit.nomad-coe.eu;
- proxy_set_header Origin https://130.183.207.113:31548;
- proxy_pass https://130.183.207.113:31548;
+ proxy_set_header Origin https://130.183.207.100:31880;
+ proxy_pass https://130.183.207.100:31880;
}
#location = /beaker/#/control {
@@ -269,21 +266,21 @@ http {
}
location /beaker/ {
- proxy_pass https://130.183.207.113:31548;
+ proxy_pass https://130.183.207.100:31880;
}
# version get request
location = /version {
- proxy_pass https://130.183.207.113:31548;
+ proxy_pass https://130.183.207.100:31880;
}
# version get request
location /notebook-edit/ {
- proxy_pass https://130.183.207.113:31548;
+ proxy_pass https://130.183.207.100:31880;
}
location ~ "^/[a-f0-9][a-f0-9][a-f0-9][a-f0-9][a-f0-9][a-f0-9][a-f0-9]/beaker/rest/util/version" {
- proxy_pass https://130.183.207.113:31548;
+ proxy_pass https://130.183.207.100:31880;
proxy_http_version 1.1;
proxy_set_header Upgrade $http_upgrade;
proxy_set_header Connection "upgrade";
@@ -292,21 +289,21 @@ http {
# forward websockets, auth using path instead of token
location ~ "^/[a-f0-9][a-f0-9][a-f0-9][a-f0-9][a-f0-9][a-f0-9][a-f0-9]/beaker/cometd-[a-z0-9]+/" {
- proxy_pass https://130.183.207.113:31548;
+ proxy_pass https://130.183.207.100:31880;
proxy_http_version 1.1;
proxy_set_header Upgrade $http_upgrade;
proxy_set_header Connection "upgrade";
}
location ~ "^/[a-f0-9][a-f0-9][a-f0-9][a-f0-9][a-f0-9][a-f0-9][a-f0-9]/r.[0-9]+/" {
- proxy_pass https://130.183.207.113:31548;
+ proxy_pass https://130.183.207.100:31880;
proxy_http_version 1.1;
proxy_set_header Upgrade $http_upgrade;
proxy_set_header Connection "upgrade";
}
location ~ "^/[a-f0-9][a-f0-9][a-f0-9][a-f0-9][a-f0-9][a-f0-9][a-f0-9]/ipython.[0-9]+/api/kernels/[0-9a-z-]+/" {
- proxy_pass https://130.183.207.113:31548;
+ proxy_pass https://130.183.207.100:31880;
proxy_http_version 1.1;
proxy_set_header Upgrade $http_upgrade;
proxy_set_header Connection "upgrade";
@@ -315,7 +312,7 @@ http {
}
location ~ "^/[a-f0-9][a-f0-9][a-f0-9][a-f0-9][a-f0-9][a-f0-9][a-f0-9]/ipython.[0-9]+/" {
- proxy_pass https://130.183.207.113:31548;
+ proxy_pass https://130.183.207.100:31880;
proxy_http_version 1.1;
proxy_set_header Upgrade $http_upgrade;
proxy_set_header Connection "upgrade";
@@ -324,7 +321,7 @@ http {
}
location ~ "^/[a-f0-9][a-f0-9][a-f0-9][a-f0-9][a-f0-9][a-f0-9][a-f0-9]/python3.[0-9]+/api/kernels/[0-9a-z-]+/" {
- proxy_pass https://130.183.207.113:31548;
+ proxy_pass https://130.183.207.100:31880;
proxy_http_version 1.1;
proxy_set_header Upgrade $http_upgrade;
proxy_set_header Connection "upgrade";
@@ -333,45 +330,45 @@ http {
}
location ~ "^/[a-f0-9][a-f0-9][a-f0-9][a-f0-9][a-f0-9][a-f0-9][a-f0-9]/python3.[0-9]+/" {
- proxy_pass https://130.183.207.113:31548;
+ proxy_pass https://130.183.207.100:31880;
proxy_set_header Origin "http://127.0.0.1:8805";
}
location ~ "^/[a-f0-9][a-f0-9][a-f0-9][a-f0-9][a-f0-9][a-f0-9][a-f0-9]/beaker/" {
- proxy_pass https://130.183.207.113:31548;
+ proxy_pass https://130.183.207.100:31880;
proxy_http_version 1.1;
proxy_set_header Upgrade $http_upgrade;
proxy_set_header Connection "upgrade";
}
location ~ "^/[a-f0-9][a-f0-9][a-f0-9][a-f0-9][a-f0-9][a-f0-9][a-f0-9]/" {
- proxy_pass https://130.183.207.113:31548;
+ proxy_pass https://130.183.207.100:31880;
}
# user directory
location /user/ {
- proxy_pass https://130.183.207.113:31548;
+ proxy_pass https://130.183.207.100:31880;
}
location = /nomad-query-gui {
- return 302 https://$server_name/notebook-edit/data/shared/sommerregen/nomad-query/nomad-query.bkr;
+ return 302 https://$server_name/notebook-edit/data/shared/tutorials/nomad-query/nomad-query.bkr;
}
location = /tutorial-metal-nonmetal {
- return 302 https://$server_name/notebook-edit/data/shared/tutorialsNew/sisso/sisso-metal-nonmetal.bkr;
+ return 302 https://$server_name/notebook-edit/data/shared/tutorial/sisso/sisso-metal-nonmetal.bkr;
}
location = /tutorial-LASSO-L0 {
- return 302 $scheme://$server_name/notebook-edit/data/shared/tutorials/LASSO_L0.bkr;
+ return 302 $scheme://$server_name/notebook-edit/data/shared/tutorials/lasso/LASSO_L0.bkr;
}
location = /tutorial-LASSO_L0 {
- return 302 $scheme://$server_name/notebook-edit/data/shared/tutorials/LASSO_L0.bkr;
+ return 302 $scheme://$server_name/notebook-edit/data/shared/tutorials/lasso/LASSO_L0.bkr;
}
location = /tutorial-embedding {
- return 302 $scheme://$server_name/notebook-edit/data/shared/tutorials/Embedding.bkr;
+ return 302 $scheme://$server_name/notebook-edit/data/shared/tutorials/embedding/Embedding.bkr;
}
location = /tutorial-SGD {
@@ -379,39 +376,35 @@ http {
}
location = /tutorial-glosim {
- return 302 $scheme://$server_name/notebook-edit/data/shared/tutorials/SOAP_similarity.bkr;
+ return 302 $scheme://$server_name/notebook-edit/data/shared/tutorials/soap-similiarity/SOAP_similarity.bkr;
}
location = /tutorial-krr {
- return 302 $scheme://$server_name/notebook-edit/data/shared/tutorials/brprototype3.bkr;
- }
-
- location = /tutorial-query {
- return 302 $scheme://$server_name/notebook-edit/data/shared/notebooks/query_example_v1_1.bkr;
+ return 302 $scheme://$server_name/notebook-edit/data/shared/tutorials/prototype/brprototype3.bkr;
}
location = /tutorial-SIS {
- return 302 https://$server_name/notebook-edit/data/shared/tutorials/sis_cscl.bkr;
+ return 302 https://$server_name/notebook-edit/data/shared/tutorials/sis/sis_cscl.bkr;
}
location = /tutorial-SIS-L0 {
- return 302 $scheme://$server_name/notebook-edit/data/shared/tutorials/sis_cscl.bkr;
+ return 302 $scheme://$server_name/notebook-edit/data/shared/tutorials/sis/sis_cscl.bkr;
}
location = /tutorial-SIS_L0 {
- return 302 $scheme://$server_name/notebook-edit/data/shared/tutorials/sis_cscl.bkr;
+ return 302 $scheme://$server_name/notebook-edit/data/shared/tutorials/sis/sis_cscl.bkr;
}
location = /tutorial-sisso-metal-non-metal {
- return 302 https://$server_name/notebook-edit/data/shared/tutorials/sisso-metal-nonmetal.bkr;
+ return 302 https://$server_name/notebook-edit/data/shared/tutorials/sisso/sisso-metal-nonmetal.bkr;
}
location = /tutorial-FF-fit {
- return 302 https://$server_name/notebook-edit/data/shared/tutorials/FF-fit.bkr;
+ return 302 https://$server_name/notebook-edit/data/shared/tutorials/ff-fit/FF-fit.bkr;
}
location = /tutorial-FF_fit {
- return 302 https://$server_name/notebook-edit/data/shared/tutorials/FF-fit.bkr;
+ return 302 https://$server_name/notebook-edit/data/shared/tutorials/ff-fit/FF-fit.bkr;
}
location = /hands-on-learning-atomic-charges {
@@ -427,11 +420,11 @@ http {
}
location = /tutorial-errorbars {
- return 302 https://$server_name/notebook-edit/data/shared/tutorials/errorbars_html.bkr;
+ return 302 https://$server_name/notebook-edit/data/shared/tutorials/errorbars/errorbars_html.bkr;
}
location = /tutorial-periodic-table {
- return 302 https://$server_name/notebook-edit/data/shared/tutorials/periodic-table.bkr;
+ return 302 https://$server_name/notebook-edit/data/shared/tutorials/periodic-table/periodic-table.bkr;
}
location = /hands-on-cs {
return 302 https://$server_name/notebook-edit/data/shared/emrea/hands-on-tutorial_CS.bkr;
@@ -442,7 +435,7 @@ http {
}
location = /custom-analytics-example {
- return 302 https://$server_name/notebook-edit/data/shared/tutorialsNew/custom-analytics-example/custom-analytics-example.bkr;
+ return 302 https://$server_name/notebook-edit/data/shared/tutorials/custom-analytics-example/custom-analytics-example.bkr;
}
}
@@ -465,7 +458,7 @@ http {
#proxy_max_temp_file_size 2G;
location / {
- proxy_pass http://130.183.207.113:30170;
+ proxy_pass http://130.183.207.100:32692;
proxy_set_header Host $host;
proxy_set_header X-Real-IP $remote_addr;
proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
--
GitLab