From 59183c3a7e17026e3957aa6019cb75195a182b29 Mon Sep 17 00:00:00 2001 From: Markus Katharina Brechtel Date: Thu, 25 Nov 2021 23:29:23 +0100 Subject: [PATCH] fix workspace invokation and require socat --- tasks/apt.yaml | 7 +++++++ templates/workspaces/workspace.space.fish.j2 | 2 +- 2 files changed, 8 insertions(+), 1 deletion(-) create mode 100644 tasks/apt.yaml diff --git a/tasks/apt.yaml b/tasks/apt.yaml new file mode 100644 index 0000000..d1791d3 --- /dev/null +++ b/tasks/apt.yaml @@ -0,0 +1,7 @@ +--- + +- name: ensure that all apt package requirements are met + apt: + pkg: + - socat + diff --git a/templates/workspaces/workspace.space.fish.j2 b/templates/workspaces/workspace.space.fish.j2 index de5cd4c..1b70344 100644 --- a/templates/workspaces/workspace.space.fish.j2 +++ b/templates/workspaces/workspace.space.fish.j2 @@ -15,7 +15,7 @@ end {% if workspaces[workspace].type == "vncviewer-ssh-socket" %} -socat "UNIX-LISTEN:.vnc/socket.anix,reuseaddr" EXEC:'ssh {{workspaces[workspace].host}} socat STDIO UNIX-CONNECT\:.vnc/socket' & +socat "UNIX-LISTEN:.vnc/socket.{{workspaces[workspace].host}},reuseaddr" EXEC:'ssh {{workspaces[workspace].host}} socat STDIO UNIX-CONNECT\:.vnc/socket' & exec xtigervncviewer .vnc/socket.{{workspaces[workspace].host}} {% elif workspaces[workspace].type == "vncviewer-ssh-tcp" %}