From 9cc3a757072dc822907c2e02e75af3cbfe752371 Mon Sep 17 00:00:00 2001
From: Fawzi Mohamed <fawzi.mohamed@fhi-berlin.mpg.de>
Date: Thu, 11 Apr 2019 22:30:07 +0200
Subject: [PATCH] update labtest

---
 nginx-labtest-nomad.conf | 78 ++++++++++++++++++----------------------
 nginx.conf.in            |  4 +--
 2 files changed, 37 insertions(+), 45 deletions(-)

diff --git a/nginx-labtest-nomad.conf b/nginx-labtest-nomad.conf
index 0900d01..0a745ad 100644
--- a/nginx-labtest-nomad.conf
+++ b/nginx-labtest-nomad.conf
@@ -115,14 +115,13 @@ http {
       alias "/usr/share/nginx/html/.well-known/";
     }
     location /nexus/ {
-      proxy_pass http://130.183.207.109:30913;
+      proxy_pass http://130.183.207.111:31049;
       proxy_set_header Host $host;
       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 /personal/ {
       #proxy_pass http://130.183.207.77:8888;
       alias "/usr/share/nginx/html/personal/";
@@ -130,41 +129,34 @@ http {
     }
 
     location /userapi/ {
-      proxy_pass https://130.183.207.109:30219;
+      proxy_pass https://130.183.207.111:31509;
     }
 
     location /api/ {
-      proxy_pass http://130.183.207.100:30448;
+      proxy_pass http://130.183.207.111:32305;
     }
 
     location /ui/ {
-      proxy_pass http://130.183.207.100:30448;
+      proxy_pass http://130.183.207.111:32305;
     }
 
     location /nmi/ {
-      proxy_pass http://130.183.207.100:30448;
+      proxy_pass http://130.183.207.111:32305;
     }
 
     location /analytics/ {
-      proxy_pass http://130.183.207.100:30155;
+      proxy_pass http://130.183.207.111:31455;
     }
 
     location /archive/ {
-      proxy_pass http://130.183.207.100:31179;
+      proxy_pass http://130.183.207.111:30668;
     }
 
 
 
-    location /stats/ {
-      proxy_pass http://130.183.207.100:31577;
-    }
-
-    location /apitest/ {
-      proxy_pass http://130.183.207.100:31577;
-    }
 
     location /jupyter/ {
-      proxy_pass https://130.183.207.109:32368;
+      proxy_pass https://130.183.207.111:31570;
       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;
@@ -178,16 +170,16 @@ http {
     }
 
     location = /jupyter {
-      proxy_pass https://130.183.207.109:32368;
+      proxy_pass https://130.183.207.111:31570;
       proxy_set_header Host $host;
-      proxy_set_header Origin https://130.183.207.109:32368;
+      proxy_set_header Origin https://130.183.207.111:31570;
       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.109:32368;
+        proxy_pass https://130.183.207.111:31570;
         proxy_set_header      Host $host;
         # websocket support
         proxy_http_version    1.1;
@@ -199,7 +191,7 @@ http {
         proxy_set_header X-Forwarded-Proto "https";
     }
     location ~ "^/jupyter/terminals/" {
-        proxy_pass https://130.183.207.109:32368;
+        proxy_pass https://130.183.207.111:31570;
         proxy_set_header      Host $host;
         # websocket support
         proxy_http_version    1.1;
@@ -224,37 +216,37 @@ http {
     }
 
     location /Creedo/ {
-      proxy_pass https://130.183.207.109:32331;
+      proxy_pass https://130.183.207.111:30355;
     }
 
     rewrite "^/notebook-edit/(.*)$" /beaker/cM/start/$1 last;
 
     location = /Shibboleth.sso {
-      proxy_pass https://130.183.207.109:31895;
+      proxy_pass https://130.183.207.111:31524;
     }
 
     location /Shibboleth.sso/ {
-      proxy_pass https://130.183.207.109:31895;
+      proxy_pass https://130.183.207.111:31524;
     }
 
     location = /shibboleth {
-      proxy_pass https://130.183.207.109:31895;
+      proxy_pass https://130.183.207.111:31524;
     }
 
     location /shibboleth/ {
-      proxy_pass https://130.183.207.109:31895;
+      proxy_pass https://130.183.207.111:31524;
     }
 
     location = /login {
       proxy_set_header Host analytics-toolkit.nomad-coe.eu;
-      proxy_set_header Origin https://130.183.207.109:31895;
-      proxy_pass https://130.183.207.109:31895;
+      proxy_set_header Origin https://130.183.207.111:31524;
+      proxy_pass https://130.183.207.111:31524;
     }
 
     location /login/ {
       proxy_set_header Host analytics-toolkit.nomad-coe.eu;
-      proxy_set_header Origin https://130.183.207.109:31895;
-      proxy_pass https://130.183.207.109:31895;
+      proxy_set_header Origin https://130.183.207.111:31524;
+      proxy_pass https://130.183.207.111:31524;
     }
 
     #location = /beaker/#/control {
@@ -266,21 +258,21 @@ http {
     }
 
     location /beaker/ {
-      proxy_pass https://130.183.207.109:31895;
+      proxy_pass https://130.183.207.111:31524;
     }
 
     # version get request
     location = /version {
-      proxy_pass https://130.183.207.109:31895;
+      proxy_pass https://130.183.207.111:31524;
     }
 
     # version get request
     location /notebook-edit/ {
-      proxy_pass https://130.183.207.109:31895;
+      proxy_pass https://130.183.207.111:31524;
     }
 
     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.109:31895;
+      proxy_pass https://130.183.207.111:31524;
       proxy_http_version 1.1;
       proxy_set_header Upgrade $http_upgrade;
       proxy_set_header Connection "upgrade";
@@ -289,21 +281,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.109:31895;
+      proxy_pass https://130.183.207.111:31524;
       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.109:31895;
+      proxy_pass https://130.183.207.111:31524;
       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.109:31895;
+      proxy_pass https://130.183.207.111:31524;
       proxy_http_version 1.1;
       proxy_set_header Upgrade $http_upgrade;
       proxy_set_header Connection "upgrade";
@@ -312,7 +304,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.109:31895;
+      proxy_pass https://130.183.207.111:31524;
       proxy_http_version 1.1;
       proxy_set_header Upgrade $http_upgrade;
       proxy_set_header Connection "upgrade";
@@ -321,7 +313,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.109:31895;
+      proxy_pass https://130.183.207.111:31524;
       proxy_http_version 1.1;
       proxy_set_header Upgrade $http_upgrade;
       proxy_set_header Connection "upgrade";
@@ -330,24 +322,24 @@ 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.109:31895;
+      proxy_pass https://130.183.207.111:31524;
       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.109:31895;
+      proxy_pass https://130.183.207.111:31524;
       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.109:31895;
+      proxy_pass https://130.183.207.111:31524;
     }
 
     # user directory
     location /user/ {
-      proxy_pass https://130.183.207.109:31895;
+      proxy_pass https://130.183.207.111:31524;
     }
 
 
@@ -458,7 +450,7 @@ http {
     #proxy_max_temp_file_size 2G;
   
     location / {
-      proxy_pass http://130.183.207.109:31744;
+      proxy_pass http://130.183.207.111:31158;
       proxy_set_header Host $host;
       proxy_set_header X-Real-IP $remote_addr;
       proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
diff --git a/nginx.conf.in b/nginx.conf.in
index 723c7ef..34781dd 100644
--- a/nginx.conf.in
+++ b/nginx.conf.in
@@ -108,9 +108,9 @@ http {
     location /.well-known/ {
       alias "/usr/share/nginx/html/.well-known/";
     }
-{{#if nexus-service}}
+{{#if nexus-web-service}}
     location /nexus/ {
-      proxy_pass http://{{nexus-service.0.nodes.[0]}}:{{nexus-service.0.ports.0.nodePort}};
+      proxy_pass http://{{nexus-web-service.0.nodes.[0]}}:{{nexus-web-service.0.ports.0.nodePort}};
       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