From 2aa942ece86828ca2483f356bccc4b8533ad674d Mon Sep 17 00:00:00 2001
From: Fawzi Mohamed <fawzi.mohamed@fhi-berlin.mpg.de>
Date: Thu, 13 Dec 2018 12:33:09 +0100
Subject: [PATCH] update labdev commands

---
 README.md                                     |  20 +-
 ...bdev-nomad.conf.yaml => labdev-nomad.yaml} |   0
 nginx-labdev-nomad.conf                       | 334 ++++++++----------
 3 files changed, 159 insertions(+), 195 deletions(-)
 rename config/{labdev-nomad.conf.yaml => labdev-nomad.yaml} (100%)

diff --git a/README.md b/README.md
index caecb81..4e4c0cd 100644
--- a/README.md
+++ b/README.md
@@ -26,7 +26,25 @@ if only that changed, otherwise on has also to create the secrets and analytics
 
 A serviceDump has to be run to reexport the ports to the frontend, then the frontend setup needs to be updated.
 
-docker run -ti -v $PWD:/frontend -v /nomad/nomadlab/servers/labdev-nomad/analytics/beaker:/usr/src/app -w /usr/src/app -v /nomad/nomadlab/servers/services-info:/services-info --rm node:carbon bash -c 'npm install; node app.js templateEvaluer --replacements /services-info/labtest-nomad.services.yaml --template /frontend/nginx.conf.in --out-file /frontend/nginx-labtest-nomad.conf2'docker run -ti -v /u/fawzi/nomad-lab-base/deploy/frontend:/frontend -v /nomad/nomadlab/servers/labdev-nomad/analytics/beaker:/usr/src/app -w /usr/src/app -v /nomad/nomadlab/servers/services-info:/services-info --rm node:carbon bash -c 'npm install; node app.js templateEvaluer --replacements /services-info/labtest-nomad.services.yaml --replacements /frontend/config/labtest-nomad.yaml --template /frontend/nginx.conf.in --out-file /frontend/nginx-labtest-nomad.conf2'
+# labdev
+
+docker run -ti -v $PWD:/frontend -v /nomad/nomadlab/servers/labdev-nomad/analytics/beaker:/usr/src/app -w /usr/src/app -v /nomad/nomadlab/servers/services-info:/services-info --rm node:carbon bash -c 'npm install; node app.js templateEvaluer --replacements /services-info/labdev-nomad.services.yaml --replacements /services-info/nomad-vis-test.services.yaml --replacements /frontend/config/labdev-nomad.yaml --template /frontend/nginx.conf.in --out-file /frontend/nginx-labdev-nomad.conf'
+
+if [ ! -e /nomad/nomadlab/servers/labdev-nomad/frontend-nginx/run ] ; then
+  mkdir -p /nomad/nomadlab/servers/labdev-nomad/frontend-nginx/run
+  chown 101:101 /nomad/nomadlab/servers/labdev-nomad/frontend-nginx/run
+fi
+if [ ! -e /nomad/nomadlab/servers/labdev-nomad/frontend-nginx/cache ] ; then
+  mkdir -p /nomad/nomadlab/servers/labdev-nomad/frontend-nginx/cache
+  chown 101:101 /nomad/nomadlab/servers/labdev-nomad/frontend-nginx/cache
+fi
+if [ ! -e /nomad/nomadlab/servers/labdev-nomad/frontend-nginx/client_temp ] ; then
+  mkdir -p /nomad/nomadlab/servers/labdev-nomad/frontend-nginx/client_temp
+  chown 101:101 /nomad/nomadlab/servers/labdev-nomad/frontend-nginx/client_temp
+fi
+docker run -d   --restart=unless-stopped   -v /root/certs:/certs:ro   -v /nomad/nomadlab/servers/labdev-nomad/web-certs:/web-certs:ro   -v /nomad/nomadlab/servers/labdev-nomad/frontend-nginx/nginx-labdev-nomad.conf:/etc/nginx/nginx.conf:ro   -v /nomad/nomadlab/servers/labdev-nomad/frontend-nginx/www-root:/usr/share/nginx/html:ro   -v /nomad/nomadlab/servers/labdev-nomad/frontend-nginx/client_temp:/etc/nginx/client_temp  -v /nomad/nomadlab/servers/labdev-nomad/frontend-nginx/cache:/var/cache/nginx -v /nomad/nomadlab/servers/labdev-nomad/frontend-nginx/run:/var/run -p 80:80 -p 443:443 -p 5509:5509 --name frontendNginx nginx
+
+# labtest
 
 docker run -ti -v $PWD:/frontend -v /nomad/nomadlab/servers/labdev-nomad/analytics/beaker:/usr/src/app -w /usr/src/app -v /nomad/nomadlab/servers/services-info:/services-info --rm node:carbon bash -c 'npm install; node app.js templateEvaluer --replacements /services-info/labtest-nomad.services.yaml --replacements /frontend/config/labtest-nomad.yaml --template /frontend/nginx.conf.in --out-file /frontend/nginx-labtest-nomad.conf'
 
diff --git a/config/labdev-nomad.conf.yaml b/config/labdev-nomad.yaml
similarity index 100%
rename from config/labdev-nomad.conf.yaml
rename to config/labdev-nomad.yaml
diff --git a/nginx-labdev-nomad.conf b/nginx-labdev-nomad.conf
index a1c3a4e..da33984 100644
--- a/nginx-labdev-nomad.conf
+++ b/nginx-labdev-nomad.conf
@@ -12,6 +12,7 @@ events {
 http {
     include       /etc/nginx/mime.types;
     default_type  application/octet-stream;
+    server_names_hash_bucket_size  64;
 
     log_format  main  '$remote_addr - $remote_user [$time_local] "$request" '
                       '$status $body_bytes_sent "$http_referer" '
@@ -42,6 +43,14 @@ http {
   uwsgi_temp_path         "client_temp";
   scgi_temp_path          "client_temp";
 
+
+
+  server {
+    listen         80;
+    server_name    labdev-nomad.esc.rzg.mpg.de;
+    return         301 https://$server_name$request_uri;
+  }
+
   server {
     autoindex off;
 
@@ -50,39 +59,58 @@ http {
     # /beaker/<uuid>/foo -> /foo
 
     listen 0.0.0.0:443 ssl;
-    server_name         labdev-nomad.esc.rzg.mpg.de;
-    #server_name         7741588557007104
-    ssl_certificate     /certs/cert-7741588557007104.pem;
-    ssl_certificate_key /certs/pkey.pem;
+    ssl_certificate     /web-certs/cert.pem;
+    ssl_certificate_key /web-certs/key.pem;
     #ssl_protocols       TLSv1 TLSv1.1 TLSv1.2;
     #ssl_ciphers         HIGH:!aNULL:!MD5;
-
+    server_name         labdev-nomad.esc.rzg.mpg.de;
 
     # redirect server error pages to the static page /50x.html and serve them directly from static html directory
     error_page   500 502 503 504  /static/50x.html;
 
-    location /nexus/ {
-      proxy_pass http://labdev3-nomad.esc.rzg.mpg.de:30788;
-      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";
+    # redirect to the starting page
+    location = / {
+      return 301 $scheme://$http_host/home/;
+    }
+
+    location = /robots.txt {
+      alias "/usr/share/nginx/html/static/robots.txt";
+    }
+
+    location /static/ {
+      alias "/usr/share/nginx/html/static/";
+    }
+
+    location /archive-browser/ {
+      try_files $uri /archive-browser/index.html;
+      alias "/usr/share/nginx/html/archive-browser/";
+    }
+   
+    location /home/ {
+      alias "/usr/share/nginx/html/home/";
+    }
+
+    location = /stats/archiveGlobalStats/static {
+      return 301 $scheme://$server_name/static/archiveGlobalStats.html;
     }
 
-    # login and loginrest are used for the public server option
-    location /loginrest/ {
-      proxy_pass https://labdev-nomad.esc.rzg.mpg.de:9124;
+    location /userapi/demos {
+      index index.json;
+      alias "/usr/share/nginx/html/userapi/demos";
+    }
+
+    location /.well-known/ {
+      alias "/usr/share/nginx/html/.well-known/";
     }
 
     # start remote vis
     location /websockify {
             proxy_http_version 1.1;
-            proxy_pass https://nomad-vis-test.esc.rzg.mpg.de:30890/;
-            #proxy_pass http://nomad-vis-test.esc.rzg.mpg.de:8809/;
-    	    proxy_set_header Upgrade $http_upgrade;
+            proxy_pass http://130.183.207.115:30413/;
+     	    proxy_set_header Upgrade $http_upgrade;
             proxy_set_header Connection "upgrade";
 
-    			 	    # VNC connection timeout                                                                        
+            # VNC connection timeout                                                                        
             proxy_read_timeout 61s;
 
             # Disable cache                                                                                 
@@ -93,9 +121,12 @@ http {
              return 301 $scheme://$server_name/remotevis/vnc.html;
     }
 
+    location /remotevis/cM/ {
+            proxy_pass http://130.183.207.115:30413;
+    }
+
     location /remotevis/ {
-            proxy_pass https://nomad-vis-test.esc.rzg.mpg.de:30890/;
-            #proxy_pass http://nomad-vis-test.esc.rzg.mpg.de:8809/;
+            proxy_pass http://130.183.207.115:30413/;
             proxy_http_version 1.1;
             proxy_set_header Upgrade $http_upgrade;
             proxy_set_header Connection "upgrade";
@@ -108,46 +139,12 @@ http {
       try_files $uri $uri/ /personal/index.html;
     }
 
-    location = /personalember-cli-live-reload.js {
-      proxy_pass http://130.183.207.77:8888;
-      #alias "/usr/share/nginx/html/personal/";
-      #try_files $uri $uri/ /personal/index.html;
-    }
-
-    location = /livereload.js {
-      proxy_pass http://130.183.207.77:8888;
-      #alias "/usr/share/nginx/html/personal/";
-      #try_files $uri $uri/ /personal/index.html;
-    }
-
-    location = /login {
-      proxy_set_header Host labdev-nomad.esc.rzg.mpg.de;
-      proxy_set_header Origin "https://labdev3-nomad.esc.rzg.mpg.de:31328";
-      proxy_pass https://labdev3-nomad.esc.rzg.mpg.de:31328;
-    }
-
     location /userapi/ {
-      proxy_pass https://130.183.207.77:8802;
-    }
-
-
-    location /api/ {
-###      proxy_pass http://nomad-flink-01.esc.rzg.mpg.de:8081;
-      proxy_pass http://labdev3-nomad.esc.rzg.mpg.de:32728;
+      proxy_pass https://130.183.207.100:30699;
     }
 
-    location /analytics/ {
-      proxy_pass http://labdev3-nomad.esc.rzg.mpg.de:32187;
-    }
 
-    location /archive/ {
-      proxy_pass http://labdev3-nomad.esc.rzg.mpg.de:32413;
-#      proxy_pass http://labdev3-nomad.esc.rzg.mpg.de:31263;
-    }
 
-    location /dev/ {
-      proxy_pass http://labdev3-nomad.esc.rzg.mpg.de:32413;
-    }
 
     location /repo/docs/ {
       proxy_pass http://staging-nomad.esc.rzg.mpg.de:8111;
@@ -157,35 +154,20 @@ http {
       proxy_pass http://staging-nomad.esc.rzg.mpg.de:8111;
     }
 
-    location /apitest/ {
-      proxy_pass http://130.183.207.112:31393;
-    }
-
-    location = /stats/archiveGlobalStats/static {
-      return 301 $scheme://$server_name/static/archiveGlobalStats.html;
-    }
-
     location /stats/ {
-      proxy_pass http://labdev3-nomad.esc.rzg.mpg.de:30403;
+      proxy_pass http://130.183.207.100:31577;
     }
 
-    location /ui/ {
-      proxy_pass http://labdev3-nomad.esc.rzg.mpg.de:32728;
-    }
-
-    location /nmi/ {
-      proxy_pass http://labdev3-nomad.esc.rzg.mpg.de:32728;
+    location /apitest/ {
+      proxy_pass http://130.183.207.100:31577;
     }
 
     location /jupyter/ {
-      proxy_pass https://labdev3-nomad.esc.rzg.mpg.de:31864;
-      #proxy_pass http://labdev-nomad.esc.rzg.mpg.de:12345;
+      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;
       proxy_set_header X-Forwarded-Proto "https";
-      #proxy_set_header Host labdev-nomad.esc.rzg.mpg.de;
-      #proxy_pass https://labdev-nomad.esc.rzg.mpg.de:8807;
       proxy_redirect off;
       proxy_buffering off;
       proxy_set_header Upgrade $http_upgrade;
@@ -195,19 +177,16 @@ http {
     }
 
     location = /jupyter {
-      proxy_pass https://labdev3-nomad.esc.rzg.mpg.de:31864;
-      #proxy_pass http://labdev-nomad.esc.rzg.mpg.de:12345;
+      proxy_pass https://130.183.207.100:32213;
       proxy_set_header Host $host;
-      proxy_set_header Origin https://labdev3-nomad.esc.rzg.mpg.de:31864;
+      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";
-      #proxy_set_header Host labdev-nomad.esc.rzg.mpg.de;
-      #proxy_pass https://labdev-nomad.esc.rzg.mpg.de:8807;
     }
 
     location ~ "^/jupyter/api/kernels/" {
-      proxy_pass https://labdev3-nomad.esc.rzg.mpg.de:31864;
+        proxy_pass https://130.183.207.100:32213;
         proxy_set_header      Host $host;
         # websocket support
         proxy_http_version    1.1;
@@ -219,7 +198,7 @@ http {
         proxy_set_header X-Forwarded-Proto "https";
     }
     location ~ "^/jupyter/terminals/" {
-      proxy_pass https://labdev3-nomad.esc.rzg.mpg.de:31864;
+        proxy_pass https://130.183.207.100:32213;
         proxy_set_header      Host $host;
         # websocket support
         proxy_http_version    1.1;
@@ -239,108 +218,68 @@ 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.100:30792;
+    }
+
+    rewrite "^/notebook-edit/(.*)$" /beaker/cM/start/$1 last;
+
     location = /Shibboleth.sso {
-      proxy_pass https://labdev3-nomad.esc.rzg.mpg.de:31328;
+      proxy_pass https://130.183.207.100:31093;
     }
 
     location /Shibboleth.sso/ {
-      proxy_pass https://labdev3-nomad.esc.rzg.mpg.de:31328;
+      proxy_pass https://130.183.207.100:31093;
     }
 
     location = /shibboleth {
-      proxy_pass https://labdev3-nomad.esc.rzg.mpg.de:31328;
+      proxy_pass https://130.183.207.100:31093;
     }
 
     location /shibboleth/ {
-      proxy_pass https://labdev3-nomad.esc.rzg.mpg.de:31328;
+      proxy_pass https://130.183.207.100:31093;
     }
 
-#    location /face_of_crystals/ { 
-   #   rewrite ^/face_of_crystals(/.*)$ $1 break;
-#      proxy_pass http://172.17.0.21:9124;
-#    }
-
-    location /login/ {
+    location = /login {
       proxy_set_header Host labdev-nomad.esc.rzg.mpg.de;
-      proxy_set_header Origin "https://labdev3-nomad.esc.rzg.mpg.de:31328";
-      proxy_pass https://labdev3-nomad.esc.rzg.mpg.de:31328;
+      proxy_set_header Origin https://130.183.207.100:31093;
+      proxy_pass https://130.183.207.100:31093;
     }
 
-    # redirect to the starting page
-    location = / {
-      return 301 $scheme://$http_host/home/;
+    location /login/ {
+      proxy_set_header Host labdev-nomad.esc.rzg.mpg.de;
+      proxy_set_header Origin https://130.183.207.100:31093;
+      proxy_pass https://130.183.207.100:31093;
     }
 
     #location = /beaker/#/control {
-    #  return 301 $scheme://$http_host/home/;
+    #  return 301 $scheme://$http_host/home;
     #}
 
-
-    location = /Creedo {
-      # return 301 $scheme://$http_host/Creedo/;
-      return 301 $scheme://analytics-toolkit.nomad-coe.eu$request_uri;
-    }
-
-    location /Creedo/ {
-      return 301 $scheme://analytics-toolkit.nomad-coe.eu$request_uri;
-      #proxy_pass http://130.183.207.77:8805;
-    }
-
-    location = /zeppelin {
-      return 301 $scheme://$http_host/zeppelin/;
-    }
-
-    location /zeppelin/ {
-      proxy_pass http://130.183.207.77:8811;
-    }
-
-    location /zeppelin/ws {
-      proxy_pass http://130.183.207.77:8811;
-      proxy_http_version 1.1;
-      proxy_set_header Upgrade $http_upgrade;
-      proxy_set_header Connection "upgrade";
-      add_header Access-Control-Allow-Origin *;
-    }
-
     location = /beaker {
       return 301 $scheme://$http_host/beaker/;
     }
 
-    location = /robots.txt {
-      alias "/usr/share/nginx/html/static/robots.txt";
-    }
-
-    location /static/ {
-      alias "/usr/share/nginx/html/static/";
-    }
-
-    location /archive-browser/ {
-      alias "/usr/share/nginx/html/archive-browser/";
-    }
-   
-    location /home/ {
-      alias "/usr/share/nginx/html/home/";
-    }
-
-
     location /beaker/ {
-      #auth_basic           "closed site";
-      #auth_basic_user_file /etc/nginx/htpasswd;
-      proxy_pass https://labdev3-nomad.esc.rzg.mpg.de:31328;
+      proxy_pass https://130.183.207.100:31093;
     }
 
     # version get request
     location = /version {
-      proxy_pass https://labdev3-nomad.esc.rzg.mpg.de:31328;
+      proxy_pass https://130.183.207.100:31093;
     }
 
     # version get request
     location /notebook-edit/ {
-      proxy_pass https://labdev3-nomad.esc.rzg.mpg.de:31328;
+      proxy_pass https://130.183.207.100:31093;
     }
 
     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://labdev3-nomad.esc.rzg.mpg.de:31328;
+      proxy_pass https://130.183.207.100:31093;
       proxy_http_version 1.1;
       proxy_set_header Upgrade $http_upgrade;
       proxy_set_header Connection "upgrade";
@@ -349,21 +288,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://labdev3-nomad.esc.rzg.mpg.de:31328;
+      proxy_pass https://130.183.207.100:31093;
       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://labdev3-nomad.esc.rzg.mpg.de:31328;
+      proxy_pass https://130.183.207.100:31093;
       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://labdev3-nomad.esc.rzg.mpg.de:31328;
+      proxy_pass https://130.183.207.100:31093;
       proxy_http_version 1.1;
       proxy_set_header Upgrade $http_upgrade;
       proxy_set_header Connection "upgrade";
@@ -372,7 +311,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://labdev3-nomad.esc.rzg.mpg.de:31328;
+      proxy_pass https://130.183.207.100:31093;
       proxy_http_version 1.1;
       proxy_set_header Upgrade $http_upgrade;
       proxy_set_header Connection "upgrade";
@@ -381,7 +320,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://labdev3-nomad.esc.rzg.mpg.de:31328;
+      proxy_pass https://130.183.207.100:31093;
       proxy_http_version 1.1;
       proxy_set_header Upgrade $http_upgrade;
       proxy_set_header Connection "upgrade";
@@ -390,68 +329,89 @@ 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://labdev3-nomad.esc.rzg.mpg.de:31328;
+      proxy_pass https://130.183.207.100:31093;
       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://labdev3-nomad.esc.rzg.mpg.de:31328;
+      proxy_pass https://130.183.207.100:31093;
       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://labdev3-nomad.esc.rzg.mpg.de:31328;
+      proxy_pass https://130.183.207.100:31093;
     }
 
     # user directory
     location /user/ {
-      proxy_pass https://labdev3-nomad.esc.rzg.mpg.de:31328;
+      proxy_pass https://130.183.207.100:31093;
+    }
+
+
+    location = /nomad-query-gui {
+      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/tutorial/sisso/sisso-metal-nonmetal.bkr;
     }
 
     location = /tutorial-LASSO-L0 {
-      return 302 https://$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 https://$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 https://$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 {
-      return 302 https://$server_name/Creedo;
+      return 302 $scheme://$server_name/Creedo/cM/start/;
     }
 
     location = /tutorial-glosim {
-      return 302 https://$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 https://$server_name/notebook-edit/data/shared/tutorials/brprototype3.bkr;
+      return 302 $scheme://$server_name/notebook-edit/data/shared/tutorials/prototype/brprototype3.bkr;
     }
 
-    location = /tutorial-query {
-      return 302 https://$server_name/notebook-edit/data/shared/notebooks/query_example_v1_1.bkr;
+    location = /tutorial-SIS {
+      return 302 https://$server_name/notebook-edit/data/shared/tutorials/sis/sis_cscl.bkr;
     }
-
+    
     location = /tutorial-SIS-L0 {
-      return 302 https://$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 https://$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/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 {
+      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/cM/start/data/shared/afekete/tutorial/GB_tutorial_Berlin_2017.ipynb;
     }
 
     location = /tutorial-ClusterX {
@@ -462,36 +422,22 @@ http {
       return 302 https://$server_name/notebook-edit/data/shared/tutorials/errorbars_html.bkr;
     }
 
-    location = /tutorial-periodictable  {
+    location = /tutorial-periodic-table  {
       return 302 https://$server_name/notebook-edit/data/shared/tutorials/periodic-table.bkr;
     }
+        location = /hands-on-cs  {
+      return 302 https://$server_name/notebook-edit/data/shared/emrea/hands-on-tutorial_CS.bkr;
+    }
 
-  }
+    location = /tutorial-face-of-crystals {
+      return 302 http://nomad-team.rz-berlin.mpg.de:443/beaker/#/open?uri=%2Fhome%2Fbeaker%2Ftutorials%2Fface_of_crystals.bkr;
+    }
 
-  server {
-  # nexus docker registry
-      autoindex off;
- 
-    listen              5509 ssl;
-    server_name         labdev-nomad.esc.rzg.mpg.de;
-    ssl_certificate     /certs/cert-7741588557007104.pem;
-    ssl_certificate_key /certs/pkey.pem;
-    #ssl_protocols       TLSv1 TLSv1.1 TLSv1.2;
-    #ssl_ciphers         HIGH:!aNULL:!MD5;
-  
-    # allow large uploads of files
-    client_max_body_size 1G;
-  
-    # optimize downloading files larger than 1G
-    #proxy_max_temp_file_size 2G;
-  
-    location / {
-      proxy_pass http://labdev3-nomad.esc.rzg.mpg.de:31547;
-      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 = /custom-analytics-example {
+      return 302 https://$server_name/notebook-edit/data/shared/tutorials/custom-analytics-example/custom-analytics-example.bkr;
     }
+
   }
+
 }
 
-- 
GitLab