From 1f2c0b616e65d6fa0a7bd8e703db45c63ea53825 Mon Sep 17 00:00:00 2001 From: Seppdo <85109829+Seppdo@users.noreply.github.com> Date: Fri, 30 Aug 2024 14:12:27 +0200 Subject: [PATCH] move all subpath build logic to terraform --- filebrowser/main.tf | 3 +-- filebrowser/run.sh | 8 ++------ 2 files changed, 3 insertions(+), 8 deletions(-) diff --git a/filebrowser/main.tf b/filebrowser/main.tf index 2e73756..fe5cc5b 100644 --- a/filebrowser/main.tf +++ b/filebrowser/main.tf @@ -83,8 +83,7 @@ resource "coder_script" "filebrowser" { LOG_PATH : var.log_path, DB_PATH : var.database_path, SUBDOMAIN : var.subdomain, - SERVER_BASE_PATH : format("/@%s/%s.%s/apps/filebrowser", - data.coder_workspace_owner.me.name, data.coder_workspace.me.name, var.agent_name), + SERVER_BASE_PATH : var.subdomain ? "" : format("/@%s/%s.%s/apps/filebrowser", 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 ef94ffb..22f13ed 100644 --- a/filebrowser/run.sh +++ b/filebrowser/run.sh @@ -17,12 +17,8 @@ if [ "${DB_PATH}" != "filebrowser.db" ]; then DB_FLAG=" -d ${DB_PATH}" fi -# set baseurl if subdomain = false -if [ "${SUBDOMAIN}" == "false" ]; then - filebrowser config set --baseurl "${SERVER_BASE_PATH}" > ${LOG_PATH} 2>&1 -else - filebrowser config set --baseurl "" > ${LOG_PATH} 2>&1 -fi +# set baseurl to be able to run if sudomain=false; if subdomain=true the SERVER_BASE_PATH value will be "" +filebrowser config set --baseurl "${SERVER_BASE_PATH}" > ${LOG_PATH} 2>&1 printf "📂 Serving $${ROOT_DIR} at http://localhost:${PORT} \n\n"