Moved the websocket to /ros-bridge to avoid a conflict with the redir

collabora · Apr 14, 2022 · cf5eb36 · cf5eb36
1 parent 9eabe35
commit cf5eb36
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 7 deletions.
diff --git a/Caddyfile b/Caddyfile
@@ -13,11 +13,7 @@ handle_path /foxglove {
 
 redir / /notebooks/notebooks/CARLA%20💜%20Foxglove%20demo.ipynb
 
-@ws {
-    header Connection *Upgrade*
-    header Upgrade websocket
-}
-reverse_proxy @ws ros-bridge:9090 {
+reverse_proxy /ros-bridge ros-bridge:9090 {
   header_up Host localhost:9090
 }
 

diff --git a/notebooks/CARLA 💜 Foxglove demo.ipynb b/notebooks/CARLA 💜 Foxglove demo.ipynb
@@ -86,7 +86,7 @@
        "    setTimeout(code_toggle, 0);\n",
        "</script>\n",
        "<button class=\"button-63\" onclick=\"restart_run_all()\">A. Setup the ego-vehicle</button><br />\n",
-       "<a class=\"button-63\" href=\"/foxglove?ds=rosbridge-websocket&ds.url=ws%3A%2F%2Flocalhost%3A8080&layoutURL=foxglove_layout.json\" target=\"_blank\">B. Open Foxglove Studio</a><br />\n",
+       "<a class=\"button-63\" href=\"/foxglove?ds=rosbridge-websocket&ds.url=ws%3A%2F%2Flocalhost%3A8080%2Fros-bridge&layoutURL=foxglove_layout.json\" target=\"_blank\">B. Open Foxglove Studio</a><br />\n",
        "<button class=\"button-63\" onclick=\"code_toggle()\">C. Explore the source code</button><br />\n"
       ],
       "text/plain": [
@@ -162,7 +162,7 @@
     "    setTimeout(code_toggle, 0);\n",
     "</script>\n",
     "<button class=\"button-63\" onclick=\"restart_run_all()\">A. Setup the ego-vehicle</button><br />\n",
-    "<a class=\"button-63\" href=\"/foxglove?ds=rosbridge-websocket&ds.url=ws%3A%2F%2Flocalhost%3A8080&layoutURL=foxglove_layout.json\" target=\"_blank\">B. Open Foxglove Studio</a><br />\n",
+    "<a class=\"button-63\" href=\"/foxglove?ds=rosbridge-websocket&ds.url=ws%3A%2F%2Flocalhost%3A8080%2Fros-bridge&layoutURL=foxglove_layout.json\" target=\"_blank\">B. Open Foxglove Studio</a><br />\n",
     "<button class=\"button-63\" onclick=\"code_toggle()\">C. Explore the source code</button><br />\n",
     "'''))"
    ]