From 7eaa3ef52ee451e10e91c1a223d3d9d02b5955e0 Mon Sep 17 00:00:00 2001 From: Girish Ramakrishnan Date: Thu, 29 Dec 2016 19:17:31 -0800 Subject: [PATCH] Use the ejs-cli of the new box code --- setup/splashpage.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/setup/splashpage.sh b/setup/splashpage.sh index 44d10802f..6d1ff276c 100755 --- a/setup/splashpage.sh +++ b/setup/splashpage.sh @@ -5,7 +5,7 @@ set -eu -o pipefail readonly SETUP_WEBSITE_DIR="/home/yellowtent/setup/website" script_dir="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)" -readonly BOX_SRC_DIR="/home/yellowtent/box" +readonly box_src_dir="$(realpath ${script_dir}/..)" readonly DATA_DIR="/home/yellowtent/data" readonly ADMIN_LOCATION="my" # keep this in sync with constants.js @@ -28,11 +28,11 @@ existing_infra="none" if [[ "${arg_retire_reason}" != "" || "${existing_infra}" != "${current_infra}" ]]; then echo "Showing progress bar on all subdomains in retired mode or infra update. retire: ${arg_retire_reason} existing: ${existing_infra} current: ${current_infra}" rm -f ${DATA_DIR}/nginx/applications/* - ${BOX_SRC_DIR}/node_modules/.bin/ejs-cli -f "${script_dir}/start/nginx/appconfig.ejs" \ + ${box_src_dir}/node_modules/.bin/ejs-cli -f "${script_dir}/start/nginx/appconfig.ejs" \ -O "{ \"vhost\": \"~^(.+)\$\", \"adminOrigin\": \"${admin_origin}\", \"endpoint\": \"splash\", \"sourceDir\": \"${SETUP_WEBSITE_DIR}\", \"certFilePath\": \"cert/host.cert\", \"keyFilePath\": \"cert/host.key\", \"xFrameOptions\": \"SAMEORIGIN\" }" > "${DATA_DIR}/nginx/applications/admin.conf" else echo "Show progress bar only on admin domain for normal update" - ${BOX_SRC_DIR}/node_modules/.bin/ejs-cli -f "${script_dir}/start/nginx/appconfig.ejs" \ + ${box_src_dir}/node_modules/.bin/ejs-cli -f "${script_dir}/start/nginx/appconfig.ejs" \ -O "{ \"vhost\": \"${admin_fqdn}\", \"adminOrigin\": \"${admin_origin}\", \"endpoint\": \"splash\", \"sourceDir\": \"${SETUP_WEBSITE_DIR}\", \"certFilePath\": \"cert/host.cert\", \"keyFilePath\": \"cert/host.key\", \"xFrameOptions\": \"SAMEORIGIN\" }" > "${DATA_DIR}/nginx/applications/admin.conf" fi