Actually use the home dir kasmvnc.yaml to retrieve the httpd_directory setting (#342)
This commit is contained in:
parent
545a245530
commit
29e5307121
@ -14,7 +14,7 @@ Automatically install [KasmVNC](https://kasmweb.com/kasmvnc) in a workspace, and
|
|||||||
module "kasmvnc" {
|
module "kasmvnc" {
|
||||||
count = data.coder_workspace.me.start_count
|
count = data.coder_workspace.me.start_count
|
||||||
source = "registry.coder.com/coder/kasmvnc/coder"
|
source = "registry.coder.com/coder/kasmvnc/coder"
|
||||||
version = "1.2.1"
|
version = "1.2.2"
|
||||||
agent_id = coder_agent.example.id
|
agent_id = coder_agent.example.id
|
||||||
desktop_environment = "xfce"
|
desktop_environment = "xfce"
|
||||||
subdomain = true
|
subdomain = true
|
||||||
|
|||||||
@ -240,7 +240,7 @@ get_http_dir() {
|
|||||||
|
|
||||||
# Check the home directory for overriding values
|
# Check the home directory for overriding values
|
||||||
if [[ -e "$HOME/.vnc/kasmvnc.yaml" ]]; then
|
if [[ -e "$HOME/.vnc/kasmvnc.yaml" ]]; then
|
||||||
d=($(grep -E "^\s*httpd_directory:.*$" /etc/kasmvnc/kasmvnc.yaml))
|
d=($(grep -E "^\s*httpd_directory:.*$" "$HOME/.vnc/kasmvnc.yaml"))
|
||||||
if [[ $${#d[@]} -eq 2 && -d "$${d[1]}" ]]; then
|
if [[ $${#d[@]} -eq 2 && -d "$${d[1]}" ]]; then
|
||||||
httpd_directory="$${d[1]}"
|
httpd_directory="$${d[1]}"
|
||||||
fi
|
fi
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user