fix shortcuts, resolve-api, labdev

nginx-labdev-nomad.conf

@@ -106,7 +106,7 @@ http {
     # start remote vis
     location /websockify {
             proxy_http_version 1.1;
-            proxy_pass http://130.183.207.115:30413/;
+            proxy_pass https://130.183.207.115:30413/;
      	    proxy_set_header Upgrade $http_upgrade;
             proxy_set_header Connection "upgrade";
 
@@ -122,11 +122,11 @@ http {
     }
 
     location /remotevis/cM/ {
-            proxy_pass http://130.183.207.115:30413;
+            proxy_pass https://130.183.207.115:30413;
     }
 
     location /remotevis/ {
-            proxy_pass http://130.183.207.115:30413/;
+            proxy_pass https://130.183.207.115:30413/;
             proxy_http_version 1.1;
             proxy_set_header Upgrade $http_upgrade;
             proxy_set_header Connection "upgrade";
@@ -143,7 +143,21 @@ http {
       proxy_pass https://130.183.207.100:30699;
     }
 
+    location /api/ {
+      proxy_pass http://130.183.207.100:30448;
+    }
+
+    location /ui/ {
+      proxy_pass http://130.183.207.100:30448;
+    }
 
+    location /nmi/ {
+      proxy_pass http://130.183.207.100:30448;
+    }
+
+    location /analytics/ {
+      proxy_pass http://130.183.207.100:30155;
+    }
 
 
     location /repo/docs/ {
@@ -419,11 +433,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;

nginx.conf.in

@@ -162,17 +162,17 @@ http {
     }
 {{/if}}
 
-{{#if api-svc-labdev.0.ports.0.nodePort}}
+{{#if resolve-api.0.ports.0.nodePort}}
     location /api/ {
-      proxy_pass http://{{api-svc-labdev.0.nodes.[0]}}:{{api-svc-labdev.0.ports.0.nodePort}};
+      proxy_pass http://{{resolve-api.0.nodes.[0]}}:{{resolve-api.0.ports.0.nodePort}};
     }
 
     location /ui/ {
-      proxy_pass http://{{api-svc-labdev.0.nodes.[0]}}:{{api-svc-labdev.0.ports.0.nodePort}};
+      proxy_pass http://{{resolve-api.0.nodes.[0]}}:{{resolve-api.0.ports.0.nodePort}};
     }
 
     location /nmi/ {
-      proxy_pass http://{{api-svc-labdev.0.nodes.[0]}}:{{api-svc-labdev.0.ports.0.nodePort}};
+      proxy_pass http://{{resolve-api.0.nodes.[0]}}:{{resolve-api.0.ports.0.nodePort}};
     }
 {{/if}}
 
@@ -478,11 +478,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;