From 71624cff0fa6b976da9e809b9441e6939637cbf7 Mon Sep 17 00:00:00 2001 From: Seppdo <85109829+Seppdo@users.noreply.github.com> Date: Fri, 30 Aug 2024 13:51:58 +0200 Subject: [PATCH] assemble base path inside terraform --- filebrowser/main.tf | 7 +++---- filebrowser/run.sh | 2 +- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/filebrowser/main.tf b/filebrowser/main.tf index 338eaac..dc93b53 100644 --- a/filebrowser/main.tf +++ b/filebrowser/main.tf @@ -82,10 +82,9 @@ resource "coder_script" "filebrowser" { FOLDER : var.folder, LOG_PATH : var.log_path, DB_PATH : var.database_path, - WORKSPACE_NAME : data.coder_workspace.me.name, - OWNER_NAME : data.coder_workspace_owner.me.name, - AGENT_NAME : var.agent_name - SUBDOMAIN : var.subdomain + SUBDOMAIN : var.subdomain, + SERVER_BASE_PATH : format("/@%s/%s.%s/apps/vscode-web/", + data.coder_workspace_owner.me.name, data.coder_workspace.me.name, var.agent_name), }) run_on_start = true } diff --git a/filebrowser/run.sh b/filebrowser/run.sh index 7a5c937..ef94ffb 100644 --- a/filebrowser/run.sh +++ b/filebrowser/run.sh @@ -19,7 +19,7 @@ fi # set baseurl if subdomain = false if [ "${SUBDOMAIN}" == "false" ]; then - filebrowser config set --baseurl "/@${OWNER_NAME}/${WORKSPACE_NAME}.${RESOURCE_NAME}/apps/filebrowser" > ${LOG_PATH} 2>&1 + filebrowser config set --baseurl "${SERVER_BASE_PATH}" > ${LOG_PATH} 2>&1 else filebrowser config set --baseurl "" > ${LOG_PATH} 2>&1 fi