deploy update

deploy/README.md

@@ -6,11 +6,12 @@ In general scripts create files to do the installation and print out commands.
 For security reasons they do not execute the deployment themselves.
 You might want to do it manually, or deploy only part of the system.
 
-## deploy/kubernetes
+## deploy/kubernetes.txt
+
 
 ## deploy/base
 
-contains info for deploying the basic infrastructure on the top of kubernetes (execute the baseSetup.sh script)
+contains info for deploying the basic infrastructure: Docker, kubernetes and on the top of kubernetes (execute the baseSetup.sh script)
 
 ## deploy/frontend
 

deploy/frontend/nginx.conf.in

@@ -99,7 +99,18 @@ http {
       return 301 $scheme://$server_name/static/archiveGlobalStats.html;
     }
 
+    location /analytics/springer {
+      alias "/usr/share/nginx/html/analytics/springer";
+    }
+
+    location /userapi/demos {
+      index index.json;
+      alias "/usr/share/nginx/html/userapi/demos";
+    }
 
+    location /.well-known/ {
+      alias "/usr/share/nginx/html/.well-known/";
+    }
 {{#if nexus-service}}
     location /nexus/ {
       proxy_pass http://labdev3-nomad.esc.rzg.mpg.de:30788;
@@ -391,6 +402,14 @@ http {
 {{/if}}
 
 {{#if frontend.0.shortcuts}}
+    location = /nomad-query-gui {
+      return 302 https://$server_name/notebook-edit/data/shared/sommerregen/nomad-query/nomad-query.bkr;
+    }
+
+   location = /tutorial-metal-nonmetal {
+      return 302 https://$server_name/notebook-edit/data/shared/tutorialsNew/sisso/sisso-metal-nonmetal.bkr;
+    }
+
     location = /tutorial-LASSO-L0 {
       return 302 $scheme://$server_name/notebook-edit/data/shared/tutorials/LASSO_L0.bkr;
     }
@@ -419,6 +438,10 @@ http {
       return 302 $scheme://$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_cscl.bkr;
+    }
+    
     location = /tutorial-SIS-L0 {
       return 302 $scheme://$server_name/notebook-edit/data/shared/tutorials/sis_cscl.bkr;
     }
@@ -427,6 +450,10 @@ http {
       return 302 $scheme://$server_name/notebook-edit/data/shared/tutorials/sis_cscl.bkr;
     }
 
+    location = /tutorial-sisso-metal-non-metal {
+      return 302 https://$server_name/notebook-edit/data/shared/tutorials/sisso-metal-nonmetal.bkr;
+    }
+
     location = /tutorial-FF-fit {
       return 302 https://$server_name/notebook-edit/data/shared/tutorials/FF-fit.bkr;
     }
@@ -435,6 +462,14 @@ http {
       return 302 https://$server_name/notebook-edit/data/shared/tutorials/FF-fit.bkr;
     }
 
+    location = /hands-on-learning-atomic-charges {
+      return 302 https://$server_name/jupyter/notebooks/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;
+    }
+
     location = /tutorial-ClusterX {
       return 302 https://$server_name/notebook-edit/data/shared/tutorials/clusterX.bkr;
     }
@@ -443,9 +478,20 @@ 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;
+    }
+
+    location = /custom-analytics-example {
+      return 302 https://$server_name/notebook-edit/data/shared/tutorialsNew/custom-analytics-example/custom-analytics-example.bkr;
+    }
 {{/if}}
 
   }