diff --git a/nginx-labtest-nomad.conf b/nginx-labtest-nomad.conf index 0859f8377a5d6e59d66b2251eebbec1922ff88ed..1b72d2dadef37473604ea58aa84291063f717573 100644 --- a/nginx-labtest-nomad.conf +++ b/nginx-labtest-nomad.conf @@ -43,6 +43,12 @@ http { uwsgi_temp_path "client_temp"; scgi_temp_path "client_temp"; + map $http_upgrade $connection_upgrade { + default upgrade; + '' close; + } + + # server { # listen 80; # server_name labtest-nomad.esc.rzg.mpg.de; @@ -355,7 +361,7 @@ http { return 302 https://$server_name/notebook-edit/data/shared/tutorials/nomad-query/nomad-query.bkr; } - location = /tutorial-metal-nonmetal { + location = /tutorial-metal-nonmetal { return 302 https://$server_name/notebook-edit/data/shared/tutorial/sisso/sisso-metal-nonmetal.bkr; } @@ -426,9 +432,10 @@ http { location = /tutorial-periodic-table { 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; - } + + # 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; @@ -438,6 +445,23 @@ http { return 302 https://$server_name/notebook-edit/data/shared/tutorials/custom-analytics-example/custom-analytics-example.bkr; } + location /jupyterhub { + proxy_pass http://130.183.207.104:31001; + 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 Upgrade $http_upgrade; + proxy_set_header Connection $connection_upgrade; + } + + location = /hands-on-cs { + return 302 $scheme://$server_name/jupyterhub/hub/user-redirect/notebooks/tutorials/compressed_sensing/compressed_sensing.ipynb; + } + + location = /hands-on-cnn { + return 302 $scheme://$server_name/jupyterhub/hub/user-redirect/notebooks/tutorials/convolutional_nn/convolutional_nn.ipynb; + } + } server {