diff --git a/kasmvnc/README.md b/kasmvnc/README.md index 40bf6fc..b90e1b2 100644 --- a/kasmvnc/README.md +++ b/kasmvnc/README.md @@ -20,18 +20,3 @@ module "kasmvnc" { ``` > **Note:** This module only works on debian-based workspaces. It is recommended to use an image with a desktop environment pre-installed to speed up the installation process. - -## Examples - -1. Add specific version of KasmVNC with [`mate`](https://mate-desktop.org/) desktop environment and custom port: - - ```tf - module "kasmvnc" { - source = "registry.coder.com/modules/kasmvnc/coder" - agent_id = coder_agent.example.id - version = "1.0.15" - kasm_version = "1.3.1" - desktop_environment = "mate" - port = 6080 - } - ``` diff --git a/kasmvnc/main.tf b/kasmvnc/main.tf index 62a3c17..02ee451 100644 --- a/kasmvnc/main.tf +++ b/kasmvnc/main.tf @@ -20,12 +20,6 @@ variable "port" { default = 6800 } -variable "desktop_environment" { - type = string - description = "The desktop environment to for KasmVNC (xfce, lxde, mate, etc)." - default = "xfce" -} - variable "kasm_version" { type = string description = "Version of KasmVNC to install." @@ -38,7 +32,6 @@ resource "coder_script" "kasm_vnc" { icon = "/icon/kasmvnc.svg" script = templatefile("${path.module}/run.sh", { PORT : var.port, - DESKTOP_ENVIRONMENT : var.desktop_environment, VERSION : var.kasm_version }) run_on_start = true diff --git a/kasmvnc/run.sh b/kasmvnc/run.sh index 38f9ee0..37153d5 100644 --- a/kasmvnc/run.sh +++ b/kasmvnc/run.sh @@ -1,11 +1,11 @@ #!/usr/bin/env bash # Check if desktop environment is installed -if ! dpkg -s ${DESKTOP_ENVIRONMENT} &> /dev/null; then +if ! dpkg -s $PACKAGES &> /dev/null; then sudo apt-get update - DEBIAN_FRONTEND=noninteractive sudo apt-get install -y ${DESKTOP_ENVIRONMENT} libdatetime-perl + DEBIAN_FRONTEND=noninteractive sudo apt-get install -y xfce4 xfce4-goodies libdatetime-perl --no-install-recommends --no-install-suggests else - echo "${DESKTOP_ENVIRONMENT} is already installed." + echo "$PACKAGES is already installed." fi # Check if vncserver is installed @@ -40,4 +40,4 @@ echo -e "password\npassword\n" | vncpasswd -wo -u $USER # Start the server printf "🚀 Starting KasmVNC server...\n" -sudo -u $USER bash -c 'vncserver -select-de "${DESKTOP_ENVIRONMENT}" -disableBasicAuth' > /tmp/kassmvncserver.log 2>&1 & +sudo -u $USER bash -c 'vncserver -select-de xfce4 -disableBasicAuth' > /tmp/kassmvncserver.log 2>&1 &