From 5c3b273e5319b6b2b01fc16aa90d0656abde516f Mon Sep 17 00:00:00 2001 From: vhsdream Date: Sat, 24 Jan 2026 14:45:30 -0500 Subject: [PATCH] Shelfmark: edit env; position frontend --- ct/shelfmark.sh | 1 + frontend/public/json/shelfmark.json | 2 +- install/shelfmark-install.sh | 7 ++++--- 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/ct/shelfmark.sh b/ct/shelfmark.sh index c76518c08..f69bca3f0 100644 --- a/ct/shelfmark.sh +++ b/ct/shelfmark.sh @@ -44,6 +44,7 @@ function update_script() { cd /opt/shelfmark/src/frontend $STD npm ci $STD npm run build + mv /opt/shelfmark/src/frontend/dist /opt/shelfmark/frontend-dist cd /opt/shelfmark $STD uv venv -c ./venv $STD uv pip install -r requirements-base.txt diff --git a/frontend/public/json/shelfmark.json b/frontend/public/json/shelfmark.json index f73232a7c..262dcd6f7 100644 --- a/frontend/public/json/shelfmark.json +++ b/frontend/public/json/shelfmark.json @@ -33,7 +33,7 @@ }, "notes": [ { - "text": "Check `https://github.com/calibrain/shelfmark/blob/main/docs/environment-variables.md` for more configuration options you can add to `/etc/shelfmark/.env`", + "text": "The configuration at `/etc/shelfmark/.env` is for bootstrapping the initial install. Customize the configuration via the Shelfmark UI.", "type": "info" } ] diff --git a/install/shelfmark-install.sh b/install/shelfmark-install.sh index da999c380..d38645bae 100644 --- a/install/shelfmark-install.sh +++ b/install/shelfmark-install.sh @@ -27,6 +27,7 @@ msg_info "Building Shelfmark frontend" cd /opt/shelfmark/src/frontend $STD npm ci $STD npm run build +mv /opt/shelfmark/src/frontend/dist /opt/shelfmark/frontend-dist msg_ok "Built Shelfmark frontend" msg_info "Configuring Shelfmark" @@ -44,8 +45,8 @@ FLASK_HOST=0.0.0.0 FLASK_PORT=8084 # SESSION_COOKIES_SECURE=true # CWA_DB_PATH= -USE_CF_BYPASS=true -USING_EXTERNAL_BYPASSER=true +# USE_CF_BYPASS=true +# USING_EXTERNAL_BYPASSER=true # EXT_BYPASSER_URL= # EXT_BYPASSER_PATH= EOF @@ -74,7 +75,7 @@ cat </opt/shelfmark/start.sh source /opt/shelfmark/venv/bin/activate set -a -source /opt/shelfmark/.env +source /etc/shelfmark/.env set +a gunicorn --worker-class geventwebsocket.gunicorn.workers.GeventWebSocketWorker --workers 1 -t 300 -b 0.0.0.0:8084 shelfmark.main:app