diff --git a/kasmvnc/main.tf b/kasmvnc/main.tf index 44b5f45..c824579 100644 --- a/kasmvnc/main.tf +++ b/kasmvnc/main.tf @@ -44,6 +44,12 @@ variable "timezone" { default = "Etc/UTC" } +variable "log_path" { + type = string + description = "Path to store KasmVNC logs." + default = "~/.kasmvnc/kasmvnc.log" +} + resource "coder_script" "kasm_vnc" { agent_id = var.agent_id display_name = "KasmVNC" @@ -52,6 +58,7 @@ resource "coder_script" "kasm_vnc" { PORT : var.port, DESKTOP_ENVIRONMENT : var.desktop_environment, VERSION : var.custom_version, + LOG_PATH : var.log_path, LOCALE : var.locale, TIMEZONE : var.timezone }) diff --git a/kasmvnc/run.sh b/kasmvnc/run.sh index 16e9d77..6394c93 100644 --- a/kasmvnc/run.sh +++ b/kasmvnc/run.sh @@ -62,4 +62,6 @@ EOF' echo -e "password\npassword\n" | vncpasswd -wo -u $USER # Start the server :) -sudo -u $USER bash -c "vncserver -select-de \"${DESKTOP_ENVIRONMENT}\" -disableBasicAuth -interface 0.0.0.0" +sudo -u $USER bash -c "vncserver -kill $DISPLAY &> ${LOG_PATH} || sudo rm -rfv /tmp/.X*-lock /tmp/.X11-unix" \ + || echo "no locks present" +sudo -u $USER bash -c "vncserver -select-de \"${DESKTOP_ENVIRONMENT}\" -disableBasicAuth -interface 0.0.0.0 >${LOG_PATH} 2>&1 &"