From db089b2b82d6b86c2214e53c3ac3335cf077cccf Mon Sep 17 00:00:00 2001
From: Anthony Wang <ta180m@pm.me>
Date: Tue, 23 Nov 2021 12:18:04 -0600
Subject: [PATCH] Integrate Guacamole with exohub

---
 guacamole.conf  | 2 --
 jupyterhub.conf | 9 ++++++---
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/guacamole.conf b/guacamole.conf
index f81541e..fff6d0c 100644
--- a/guacamole.conf
+++ b/guacamole.conf
@@ -13,7 +13,6 @@ server {
         proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
         proxy_set_header Upgrade $http_upgrade;
         proxy_set_header Connection $http_connection;
-        proxy_cookie_path /guacamole/ /new-path/;
         access_log off;
     }
 }
@@ -36,7 +35,6 @@ server {
         proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
         proxy_set_header Upgrade $http_upgrade;
         proxy_set_header Connection $http_connection;
-        proxy_cookie_path /guacamole/ /new-path/;
         access_log off;
     }
 }
diff --git a/jupyterhub.conf b/jupyterhub.conf
index 702ed68..a373b5c 100644
--- a/jupyterhub.conf
+++ b/jupyterhub.conf
@@ -7,15 +7,18 @@ server {
     ssl_certificate /etc/letsencrypt/live/exozy.me/fullchain.pem;
     ssl_certificate_key /etc/letsencrypt/live/exozy.me/privkey.pem;
 
-    # Guacamole
-    location /desk/ {
+    location ~ ^/user/(.*)/desk/(.*)$ {
+        return 301 /hub/desk/$2;
+    }
+
+    location /hub/desk/ {
         proxy_pass http://127.0.0.1:11080/guacamole/;
         proxy_buffering off;
         proxy_http_version 1.1;
         proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
         proxy_set_header Upgrade $http_upgrade;
         proxy_set_header Connection $http_connection;
-        proxy_cookie_path /guacamole/ /new-path/;
+        proxy_cookie_path /guacamole/ /hub/desk/;
         access_log off;
     }