mirror of
https://github.com/Dvorinka/Primora.git
synced 2026-10-28 07:41:23 +00:00
feat(install): ask for the public URL, wire it into .env
install.sh now asks one question on fresh installs — the URL the app is opened on. Accepts https://primora.example.com (TLS at the user's proxy), primora.example.com, or 192.168.1.50:8085; the port becomes NGINX_PORT. The answer rewrites every public URL var and COOKIE_DOMAIN for real DNS names. PUBLIC_URL env keeps it non-interactive; legacy DOMAIN/NGINX_PORT still work; reruns over an existing .env skip the question and display the URL from the file. Also trust both URL schemes on the serving host in trustedOrigins — external TLS termination makes nginx report http while browsers arrive over https. Generated with [Devin](https://devin.ai) Co-Authored-By: Devin <158243242+devin-ai-integration[bot]@users.noreply.github.com>
This commit is contained in:
1 parent
bbc57f9c0d
commit
597db3287e
4 files changed
+78
-15
No files matched your search
@@ -4,6 +4,10 @@ All notable changes to Primora. Format follows [Keep a Changelog](https://keepac
|
||||
|
||||
## [Unreleased]
|
||||
|
||||
### Added
|
||||
|
||||
- **Install script asks for the public URL** — `install.sh` now prompts for where you'll open the app and accepts a full URL: `https://primora.example.com` (TLS at your proxy, hints printed at the end), `primora.example.com`, or `192.168.1.50:8085` (the port becomes `NGINX_PORT`). The answer rewrites every public URL var in `.env` and `COOKIE_DOMAIN` for real DNS names. Non-interactive via `PUBLIC_URL=`; legacy `DOMAIN`/`NGINX_PORT` envs still work; reruns over an existing `.env` skip the question.
|
||||
|
||||
## [0.8.2] - 2026-09-28
|
||||
|
||||
### Fixed
|
||||
|
||||
@@ -77,7 +77,9 @@ Prerequisites: Docker with the Compose plugin.
|
||||
curl -fsSL https://raw.githubusercontent.com/Dvorinka/Primora/master/install.sh | bash
|
||||
```
|
||||
|
||||
Installs into `./primora`, generates secrets, and starts the stack on port 80.
|
||||
Installs into `./primora`, asks one question — the URL you'll open the app on
|
||||
(domain, IP, optional port) — generates secrets, and starts the stack.
|
||||
Non-interactive: `PUBLIC_URL=https://primora.example.com bash install.sh`.
|
||||
Or from a clone:
|
||||
|
||||
```bash
|
||||
|
||||
@@ -63,6 +63,9 @@ export const auth = betterAuth({
|
||||
if (host) {
|
||||
const proto = request?.headers.get("x-forwarded-proto") ?? "http";
|
||||
origins.push(`${proto}://${host}`);
|
||||
// TLS often terminates at an external proxy — nginx then reports http.
|
||||
// Both schemes on the serving host are legitimately this instance.
|
||||
origins.push(proto === "https" ? `http://${host}` : `https://${host}`);
|
||||
}
|
||||
return origins;
|
||||
},
|
||||
|
||||
+68
-14
@@ -3,8 +3,14 @@
|
||||
#
|
||||
# curl -fsSL https://raw.githubusercontent.com/Dvorinka/Primora/master/install.sh | bash
|
||||
#
|
||||
# Installs into ./primora (override with PRIMORA_DIR). Non-interactive:
|
||||
# DOMAIN=example.com NGINX_PORT=8080 bash install.sh
|
||||
# Installs into ./primora (override with PRIMORA_DIR). On a fresh install,
|
||||
# interactive shells get one question — the URL the app will be opened on
|
||||
# (domain or IP, optional port). Non-interactive:
|
||||
# PUBLIC_URL=https://primora.example.com bash install.sh
|
||||
# DOMAIN=192.168.1.50 NGINX_PORT=8085 bash install.sh (legacy form)
|
||||
#
|
||||
# https URLs mean TLS terminates at your own proxy in front of Primora's
|
||||
# bundled nginx (which always speaks http on NGINX_PORT).
|
||||
#
|
||||
# Pulls prebuilt GHCR images when available; otherwise downloads the source
|
||||
# tarball and builds locally. Either way the result is the same compose stack.
|
||||
@@ -14,8 +20,8 @@ set -euo pipefail
|
||||
REPO="Dvorinka/Primora"
|
||||
REF="${PRIMORA_REF:-master}"
|
||||
DIR="${PRIMORA_DIR:-primora}"
|
||||
DOMAIN="${DOMAIN:-localhost}"
|
||||
NGINX_PORT="${NGINX_PORT:-80}"
|
||||
PUBLIC_URL="${PUBLIC_URL:-}"
|
||||
|
||||
info() { echo "==> $*"; }
|
||||
die() { echo "ERROR: $*" >&2; exit 1; }
|
||||
@@ -37,7 +43,51 @@ for f in docker-compose.yml .env.example infra/nginx/default.conf; do
|
||||
curl -fsSL "https://raw.githubusercontent.com/$REPO/$REF/$f" -o "$f"
|
||||
done
|
||||
|
||||
if [ ! -f .env ]; then
|
||||
if [ -f .env ]; then
|
||||
info "Existing .env kept"
|
||||
# Display URL comes from the file — answers here would change nothing.
|
||||
PUBLIC_URL="$(grep -E '^VITE_APP_URL=' .env | tail -1 | cut -d= -f2- || true)"
|
||||
[ -z "$PUBLIC_URL" ] && PUBLIC_URL="http://localhost"
|
||||
else
|
||||
# Public URL — the single question. Env wins, then prompt, then default.
|
||||
if [ -z "$PUBLIC_URL" ] && [ -n "${DOMAIN:-}" ]; then
|
||||
PUBLIC_URL="http://${DOMAIN}"
|
||||
[ "$NGINX_PORT" != "80" ] && PUBLIC_URL="$PUBLIC_URL:$NGINX_PORT"
|
||||
fi
|
||||
if [ -z "$PUBLIC_URL" ]; then
|
||||
DEFAULT_URL="http://localhost"
|
||||
[ "$NGINX_PORT" != "80" ] && DEFAULT_URL="http://localhost:$NGINX_PORT"
|
||||
if [ -t 0 ]; then
|
||||
read -rp "URL where you'll open Primora (domain or IP, e.g. https://primora.example.com) [$DEFAULT_URL]: " PUBLIC_URL
|
||||
PUBLIC_URL="${PUBLIC_URL:-$DEFAULT_URL}"
|
||||
else
|
||||
PUBLIC_URL="$DEFAULT_URL"
|
||||
fi
|
||||
fi
|
||||
|
||||
# Normalize: default scheme http, strip trailing slash.
|
||||
case "$PUBLIC_URL" in
|
||||
http://*|https://*) ;;
|
||||
*) PUBLIC_URL="http://$PUBLIC_URL" ;;
|
||||
esac
|
||||
PUBLIC_URL="${PUBLIC_URL%/}"
|
||||
|
||||
# Split host[:port]; URL paths aren't supported — nginx mounts auth at /auth.
|
||||
REST="${PUBLIC_URL#*://}"
|
||||
HOSTPORT="${REST%%/*}"
|
||||
[ "$REST" != "$HOSTPORT" ] && die "URL paths are not supported — use a domain or port instead: $PUBLIC_URL"
|
||||
if [[ "$HOSTPORT" == *:* ]]; then
|
||||
HOST="${HOSTPORT%%:*}"
|
||||
PORT="${HOSTPORT##*:}"
|
||||
else
|
||||
HOST="$HOSTPORT"; PORT=""
|
||||
fi
|
||||
[ -z "$HOST" ] && die "could not parse a host from: $PUBLIC_URL"
|
||||
if [ -n "$PORT" ]; then
|
||||
[[ "$PORT" =~ ^[0-9]+$ ]] || die "invalid port in: $PUBLIC_URL"
|
||||
NGINX_PORT="$PORT"
|
||||
fi
|
||||
|
||||
info "Generating .env with random secrets"
|
||||
cp .env.example .env
|
||||
|
||||
@@ -53,12 +103,15 @@ if [ ! -f .env ]; then
|
||||
"${SED[@]}" "s|^PRIMORA_ENCRYPTION_KEY=.*|PRIMORA_ENCRYPTION_KEY=$ENCRYPTION_KEY|" .env
|
||||
"${SED[@]}" "s|^NGINX_PORT=.*|NGINX_PORT=$NGINX_PORT|" .env
|
||||
|
||||
if [ "$DOMAIN" != "localhost" ]; then
|
||||
"${SED[@]}" "s|http://localhost|http://$DOMAIN|g" .env
|
||||
"${SED[@]}" "s|^COOKIE_DOMAIN=.*|COOKIE_DOMAIN=$DOMAIN|" .env
|
||||
# Every public URL var (VITE_APP_URL, BETTER_AUTH_URL, AUTH_BASE_URL,
|
||||
# VITE_AUTH_BASE_URL, VITE_API_BASE_URL, BACKEND_PUBLIC_URL) is built on the
|
||||
# http://localhost prefix in .env.example — one rewrite covers them all.
|
||||
"${SED[@]}" "s|http://localhost|$PUBLIC_URL|g" .env
|
||||
|
||||
# Cookie domains only apply to real DNS names — never IPs or localhost.
|
||||
if [ "$HOST" != "localhost" ] && ! [[ "$HOST" =~ ^[0-9.]+$ ]]; then
|
||||
"${SED[@]}" "s|^COOKIE_DOMAIN=.*|COOKIE_DOMAIN=$HOST|" .env
|
||||
fi
|
||||
else
|
||||
info "Existing .env kept"
|
||||
fi
|
||||
|
||||
# Compose v5 skips `pull` for services that declare build:, so fetch the
|
||||
@@ -79,11 +132,12 @@ else
|
||||
docker compose up -d --build
|
||||
fi
|
||||
|
||||
DISPLAY_URL="http://$DOMAIN"
|
||||
[ "$NGINX_PORT" != "80" ] && DISPLAY_URL="$DISPLAY_URL:$NGINX_PORT"
|
||||
|
||||
info "Primora is starting"
|
||||
echo " Dashboard: $DISPLAY_URL"
|
||||
echo " Health: $DISPLAY_URL/api/v1/health/liveness"
|
||||
echo " Dashboard: $PUBLIC_URL"
|
||||
echo " Health: $PUBLIC_URL/api/v1/health/liveness"
|
||||
echo " Logs: cd $DIR && docker compose logs -f"
|
||||
echo " Stop: cd $DIR && docker compose down"
|
||||
if [[ "$PUBLIC_URL" == https://* ]]; then
|
||||
echo
|
||||
echo " Primora listens on http port $NGINX_PORT — point your TLS proxy there."
|
||||
fi
|
||||
Reference in new issue
Block a user