fix creedo start and api for labtest

nginx-labtest-nomad.conf

@@ -134,6 +134,17 @@ http {
     }
 
 
+    location /api/ {
+      proxy_pass http://130.183.207.113:32600;
+    }
+
+    location /ui/ {
+      proxy_pass http://130.183.207.113:32600;
+    }
+
+    location /nmi/ {
+      proxy_pass http://130.183.207.113:32600;
+    }
 
 
     location /archive/ {
@@ -209,6 +220,13 @@ http {
       proxy_pass http://labdev-nomad.esc.rzg.mpg.de:34695;
     }
 
+    location = /Creedo {
+      return 301 $scheme://$server_name/Creedo/cM/start/;
+    }
+
+    location /Creedo/ {
+      proxy_pass https://130.183.207.113:31833;
+    }
 
     rewrite "^/notebook-edit/(.*)$" /beaker/cM/start/$1 last;
 
@@ -355,7 +373,7 @@ http {
     }
 
     location = /tutorial-SGD {
-      return 302 $scheme://$server_name/Creedo;
+      return 302 $scheme://$server_name/Creedo/cM/start/;
     }
 
     location = /tutorial-glosim {
@@ -395,11 +413,11 @@ http {
     }
 
     location = /hands-on-learning-atomic-charges {
-      return 302 https://$server_name/jupyter/notebooks/shared/afekete/tutorial/learning_atomic_charges.ipynb;
+      return 302 https://$server_name/jupyter/cM/start/data/shared/afekete/tutorial/learning_atomic_charges.ipynb;
     }
 
     location = /hands-on-grain-boundaries {
-      return 302 https://$server_name/jupyter/notebooks/shared/afekete/tutorial/GB_tutorial_Berlin_2017.ipynb;
+      return 302 https://$server_name/jupyter/cM/start/data/shared/afekete/tutorial/GB_tutorial_Berlin_2017.ipynb;
     }
 
     location = /tutorial-ClusterX {

nginx.conf.in

@@ -278,7 +278,7 @@ http {
 
 {{#if nomad-container-manager-creedo.0.ports.0.nodePort}}
     location = /Creedo {
-      proxy_pass {{nomad-container-manager-creedo.0.frontendProtocol}}//{{nomad-container-manager-creedo.0.nodes.[0]}}:{{nomad-container-manager-creedo.0.ports.0.nodePort}};
+      return 301 $scheme://$server_name/Creedo/cM/start/;
     }
 
     location /Creedo/ {
@@ -434,7 +434,7 @@ http {
     }
 
     location = /tutorial-SGD {
-      return 302 $scheme://$server_name/Creedo;
+      return 302 $scheme://$server_name/Creedo/cM/start/;
     }
 
     location = /tutorial-glosim {
@@ -474,11 +474,11 @@ http {
     }
 
     location = /hands-on-learning-atomic-charges {
-      return 302 https://$server_name/jupyter/notebooks/shared/afekete/tutorial/learning_atomic_charges.ipynb;
+      return 302 https://$server_name/jupyter/cM/start/data/shared/afekete/tutorial/learning_atomic_charges.ipynb;
     }
 
     location = /hands-on-grain-boundaries {
-      return 302 https://$server_name/jupyter/notebooks/shared/afekete/tutorial/GB_tutorial_Berlin_2017.ipynb;
+      return 302 https://$server_name/jupyter/cM/start/data/shared/afekete/tutorial/GB_tutorial_Berlin_2017.ipynb;
     }
 
     location = /tutorial-ClusterX {