Termix-SSH
diff --git a/‎README.md‎
Lines changed: 21 additions & 3 deletions b/‎README.md‎
Lines changed: 21 additions & 3 deletions
diff --git a/‎docker/docker-compose.yml‎
Lines changed: 32 additions & 0 deletions b/‎docker/docker-compose.yml‎
Lines changed: 32 additions & 0 deletions
diff --git a/‎docker/nginx-https.conf‎
Lines changed: 79 additions & 13 deletions b/‎docker/nginx-https.conf‎
Lines changed: 79 additions & 13 deletions
@@ -46,12 +46,13 @@ If you would like, you can support the project here!\
 
 Termix is an open-source, forever-free, self-hosted all-in-one server management platform. It provides a multi-platform
 solution for managing your servers and infrastructure through a single, intuitive interface. Termix offers SSH terminal
-access, SSH tunneling capabilities, remote file management, and many other tools. Termix is the perfect
+access, remote desktop control (RDP, VNC, Telnet), SSH tunneling capabilities, remote SSH file management, and many other tools. Termix is the perfect
 free and self-hosted alternative to Termius available for all platforms.
 
 # Features
 
 - **SSH Terminal Access** - Full-featured terminal with split-screen support (up to 4 panels) with a browser-like tab system. Includes support for customizing the terminal including common terminal themes, fonts, and other components.
+- **Remote Desktop Access** - RDP, VNC, and Telnet support over the browser with complete customization and split screening
 - **SSH Tunnel Management** - Create and manage SSH tunnels with automatic reconnection and health monitoring and support for -l or -r connections
 - **Remote File Manager** - Manage files directly on remote servers with support for viewing and editing code, images, audio, and video. Upload, download, rename, delete, and move files seamlessly with sudo support.
 - **Docker Management** - Start, stop, pause, remove containers. View container stats. Control container using docker exec terminal. It was not made to replace Portainer or Dockge but rather to simply manage your containers compared to creating them.
@@ -105,7 +106,7 @@ Supported Devices:
   - APK
 
 Visit the Termix [Docs](https://docs.termix.site/install) for more information on how to install Termix on all platforms. Otherwise, view
-a sample Docker Compose file here:
+a sample Docker Compose file here (you can omit guacd and the network if you don't plan on using remote desktop features):
 
 ```yaml
 services:
@@ -119,10 +120,27 @@ services:
       - termix-data:/app/data
     environment:
       PORT: "8080"
+    depends_on:
+      - guacd
+    networks:
+      - termix-net
+
+  guacd:
+    image: guacamole/guacd:latest
+    container_name: guacd
+    restart: unless-stopped
+    ports:
+      - "4822:4822"
+    networks:
+      - termix-net
 
 volumes:
   termix-data:
     driver: local
+
+networks:
+  termix-net:
+    driver: bridge
 ```
 
 # Sponsors
@@ -153,7 +171,7 @@ channel, however, response times may be longer.
 
 # Screenshots
 
-[![YouTube](./repo-images/YouTube.jpg)](https://youtu.be/sjKIqfCK0NY)
+[![YouTube](./repo-images/YouTube.jpg)](https://www.youtube.com/@TermixSSH/videos)
 
 <p align="center">
   <img src="./repo-images/Image 1.png" width="400" alt="Termix Demo 1"/>
 
@@ -0,0 +1,32 @@
+services:
+  termix:
+    image: ghcr.io/lukegus/termix:latest
+    container_name: termix
+    restart: unless-stopped
+    ports:
+      - "8080:8080"
+    volumes:
+      - termix-data:/app/data
+    environment:
+      PORT: "8080"
+    depends_on:
+      - guacd
+    networks:
+      - termix-net
+
+  guacd:
+    image: guacamole/guacd:latest
+    container_name: guacd
+    restart: unless-stopped
+    ports:
+      - "4822:4822"
+    networks:
+      - termix-net
+
+volumes:
+  termix-data:
+    driver: local
+
+networks:
+  termix-net:
+    driver: bridge
@@ -218,7 +218,7 @@ http {
             proxy_set_header X-Forwarded-Proto $scheme;
         }
 
-        location /ssh/quick-connect {
+        location /host/quick-connect {
             proxy_pass http://127.0.0.1:30001;
             proxy_http_version 1.1;
             proxy_set_header Upgrade $http_upgrade;
@@ -230,8 +230,8 @@ http {
             proxy_set_header X-Forwarded-Proto $scheme;
         }
 
-        location ~ ^/ssh/opkssh-chooser(/.*)?$ {
-            proxy_pass http://127.0.0.1:30001/ssh/opkssh-chooser$1$is_args$args;
+        location ~ ^/host/opkssh-chooser(/.*)?$ {
+            proxy_pass http://127.0.0.1:30001/host/opkssh-chooser$1$is_args$args;
             proxy_http_version 1.1;
             proxy_set_header Host $http_host;
             proxy_set_header X-Forwarded-Host $proxy_x_forwarded_host;
@@ -245,8 +245,8 @@ http {
             add_header Cache-Control "no-store, no-cache, must-revalidate, proxy-revalidate, max-age=0";
         }
 
-        location ~ ^/ssh/opkssh-callback(/.*)?$ {
-            proxy_pass http://127.0.0.1:30001/ssh/opkssh-callback$1$is_args$args;
+        location ~ ^/host/opkssh-callback(/.*)?$ {
+            proxy_pass http://127.0.0.1:30001/host/opkssh-callback$1$is_args$args;
             proxy_http_version 1.1;
             proxy_set_header Host $http_host;
             proxy_set_header X-Forwarded-Host $proxy_x_forwarded_host;
@@ -260,7 +260,7 @@ http {
             add_header Cache-Control "no-store, no-cache, must-revalidate, proxy-revalidate, max-age=0";
         }
 
-        location /ssh/ {
+        location /host/ {
             proxy_pass http://127.0.0.1:30001;
             proxy_http_version 1.1;
             proxy_set_header Host $http_host;
@@ -294,7 +294,41 @@ http {
             proxy_next_upstream error timeout invalid_header http_500 http_502 http_503;
         }
 
-        location /ssh/tunnel/ {
+        location ^~ /guacamole/websocket/ {
+            proxy_pass http://127.0.0.1:30008/;
+            proxy_http_version 1.1;
+
+            proxy_set_header Upgrade $http_upgrade;
+            proxy_set_header Connection "upgrade";
+            proxy_set_header Host $http_host;
+            proxy_cache_bypass $http_upgrade;
+
+            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 $scheme;
+            proxy_set_header X-Forwarded-Port $server_port;
+            proxy_set_header X-Forwarded-Host $http_host;
+
+            proxy_read_timeout 86400s;
+            proxy_send_timeout 86400s;
+            proxy_connect_timeout 10s;
+
+            proxy_buffering off;
+            proxy_request_buffering off;
+
+            proxy_next_upstream error timeout invalid_header http_500 http_502 http_503;
+        }
+
+        location ~ ^/guacamole(/.*)?$ {
+            proxy_pass http://127.0.0.1:30001;
+            proxy_http_version 1.1;
+            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 $scheme;
+        }
+
+        location /host/tunnel/ {
             proxy_pass http://127.0.0.1:30003;
             proxy_http_version 1.1;
             proxy_set_header Host $http_host;
@@ -303,7 +337,7 @@ http {
             proxy_set_header X-Forwarded-Proto $scheme;
         }
 
-        location /ssh/file_manager/recent {
+        location /host/file_manager/recent {
             proxy_pass http://127.0.0.1:30001;
             proxy_http_version 1.1;
             proxy_set_header Host $http_host;
@@ -312,7 +346,7 @@ http {
             proxy_set_header X-Forwarded-Proto $scheme;
         }
 
-        location /ssh/file_manager/pinned {
+        location /host/file_manager/pinned {
             proxy_pass http://127.0.0.1:30001;
             proxy_http_version 1.1;
             proxy_set_header Host $http_host;
@@ -321,7 +355,7 @@ http {
             proxy_set_header X-Forwarded-Proto $scheme;
         }
 
-        location /ssh/file_manager/shortcuts {
+        location /host/file_manager/shortcuts {
             proxy_pass http://127.0.0.1:30001;
             proxy_http_version 1.1;
             proxy_set_header Host $http_host;
@@ -330,7 +364,7 @@ http {
             proxy_set_header X-Forwarded-Proto $scheme;
         }
 
-        location /ssh/file_manager/sudo-password {
+        location /host/file_manager/sudo-password {
             proxy_pass http://127.0.0.1:30004;
             proxy_http_version 1.1;
             proxy_set_header Host $http_host;
@@ -339,7 +373,28 @@ http {
             proxy_set_header X-Forwarded-Proto $scheme;
         }
 
-        location /ssh/file_manager/ssh/ {
+        location /ssh/file_manager/ {
+            client_max_body_size 5G;
+            client_body_timeout 300s;
+
+            add_header Cache-Control "no-store, no-cache, must-revalidate" always;
+
+            proxy_pass http://127.0.0.1:30004;
+            proxy_http_version 1.1;
+            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 $scheme;
+
+            proxy_connect_timeout 60s;
+            proxy_send_timeout 300s;
+            proxy_read_timeout 300s;
+
+            proxy_request_buffering off;
+            proxy_buffering off;
+        }
+
+        location /host/file_manager/ssh/ {
             client_max_body_size 5G;
             client_body_timeout 300s;
 
@@ -400,6 +455,15 @@ http {
             proxy_read_timeout 60s;
         }
 
+        location ~ ^/global-settings(/.*)?$ {
+            proxy_pass http://127.0.0.1:30005;
+            proxy_http_version 1.1;
+            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 $scheme;
+        }
+
         location ~ ^/uptime(/.*)?$ {
             proxy_pass http://127.0.0.1:30006;
             proxy_http_version 1.1;
@@ -428,7 +492,7 @@ http {
         }
 
         location ^~ /docker/console/ {
-            proxy_pass http://127.0.0.1:30008/;
+            proxy_pass http://127.0.0.1:30009/;
             proxy_http_version 1.1;
 
             proxy_set_header Upgrade $http_upgrade;
@@ -439,6 +503,8 @@ http {
             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 $scheme;
+            proxy_set_header X-Forwarded-Port $server_port;
+            proxy_set_header X-Forwarded-Host $http_host;
 
             proxy_read_timeout 86400s;
             proxy_send_timeout 86400s;