diff --git a/backend/capellacollab/alembic/versions/7683b08b00ba_add_environment_and_connection_info_to_.py b/backend/capellacollab/alembic/versions/7683b08b00ba_add_environment_and_connection_info_to_.py index 7399452ad..e83bf3b33 100644 --- a/backend/capellacollab/alembic/versions/7683b08b00ba_add_environment_and_connection_info_to_.py +++ b/backend/capellacollab/alembic/versions/7683b08b00ba_add_environment_and_connection_info_to_.py @@ -112,11 +112,9 @@ def get_eclipse_configuration(): { "type": "guacamole", "id": "guacamole", - "name": "Classic (Guacamole)", + "name": "Guacamole", "description": ( - "Old connection method using Guacamole. " - "If it has worked fine previously, keep using it. " - "In case of issues, try the Xpra connection method." + "Guacamole doesn't support session sharing." ), "ports": {"metrics": 9118, "rdp": 3389}, "environment": {"CONNECTION_METHOD": "xrdp"}, @@ -124,11 +122,8 @@ def get_eclipse_configuration(): { "type": "http", "id": "xpra", - "name": "Experimental (Xpra)", - "description": ( - "Experimental connection method using Xpra. " - "It's intended for those users who have issues with the Guacamole connection method." - ), + "name": "Xpra", + "description": "Xpra supports session sharing.", "ports": {"http": 10000, "metrics": 9118}, "environment": { "CONNECTION_METHOD": "xpra", diff --git a/backend/capellacollab/core/database/migration.py b/backend/capellacollab/core/database/migration.py index 91e1707ab..87943515e 100644 --- a/backend/capellacollab/core/database/migration.py +++ b/backend/capellacollab/core/database/migration.py @@ -143,22 +143,15 @@ def get_eclipse_session_configuration() -> ( methods=[ tools_models.GuacamoleConnectionMethod( id="guacamole", - name="Classic (Guacamole)", - description=( - "Old connection method using Guacamole. " - "If it has worked fine previously, keep using it. " - "In case of issues, try the Xpra connection method." - ), + name="Guacamole", + description="Guacamole doesn't support session sharing.", ports=tools_models.RDPPorts(metrics=9118, rdp=3389), environment={"CONNECTION_METHOD": "xrdp"}, ), tools_models.HTTPConnectionMethod( id="xpra", - name="Experimental (Xpra)", - description=( - "Experimental connection method using Xpra. " - "It's intended for those users who have issues with the Guacamole connection method." - ), + name="Xpra", + description="Xpra supports session sharing.", ports=tools_models.HTTPPorts(http=10000, metrics=9118), environment={ "CONNECTION_METHOD": "xpra", diff --git a/backend/tests/test_feedback.py b/backend/tests/test_feedback.py index 62c254f03..b8fac1bc5 100644 --- a/backend/tests/test_feedback.py +++ b/backend/tests/test_feedback.py @@ -100,7 +100,7 @@ def test_send_feedback_with_session( "warnings": [], "connection_method": { "id": "xpra", - "name": "Experimental (Xpra)", + "name": "Xpra", }, } ], diff --git a/docs/docs/admin/tools/configuration.md b/docs/docs/admin/tools/configuration.md index 919489889..e60f844c3 100644 --- a/docs/docs/admin/tools/configuration.md +++ b/docs/docs/admin/tools/configuration.md @@ -341,11 +341,8 @@ To help you configure your tools, we provide some examples as part of our methods: - id: guacamole type: guacamole - name: Classic (Guacamole) - description: Old connection method using Guacamole. If - it has worked fine previously, keep using it. - In case of issues, try the Xpra connection - method. + name: Guacamole + description: Guacamole doesn't support session sharing. ports: metrics: 9118 rdp: 3389 @@ -353,10 +350,8 @@ To help you configure your tools, we provide some examples as part of our CONNECTION_METHOD: xrdp - id: xpra type: http - name: Experimental (Xpra) - description: Experimental connection method using Xpra. - It's intended for those users who have issues - with the Guacamole connection method. + name: Xpra + description: Xpra supports session sharing. ports: metrics: 9118 http: 10000