Private
Public Access
Compare commits
3
Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
78611c0eae | ||
|
|
50d2ba9404 | ||
|
|
8c23cc631c |
No files matched your search
+5
-3
@@ -55,7 +55,8 @@ and 4 below first — prerequisites and what `.env` controls.
|
||||
|
||||
## 1. Prerequisites
|
||||
|
||||
- Python 3.11 or 3.12
|
||||
- Python 3.11 or 3.12, with its `venv` module (Debian/Ubuntu split this into a
|
||||
separate `python3.X-venv` package — see below)
|
||||
- Redis (Celery's broker)
|
||||
- **Postgres only**: a PostgreSQL server (12+) and its client headers if you're not
|
||||
using the bundled `psycopg[binary]` wheel (most platforms are covered by the wheel,
|
||||
@@ -63,10 +64,11 @@ and 4 below first — prerequisites and what `.env` controls.
|
||||
- nginx (or another reverse proxy)
|
||||
- A domain name pointed at the host, if you want this reachable outside your LAN
|
||||
|
||||
Debian/Ubuntu example for the non-Python pieces:
|
||||
Debian/Ubuntu example for the non-Python pieces (swap `python3.13-venv` for
|
||||
whatever `python3 --version` reports on your system):
|
||||
|
||||
```bash
|
||||
sudo apt install redis-server nginx
|
||||
sudo apt install redis-server nginx python3.13-venv
|
||||
# Postgres only:
|
||||
sudo apt install postgresql
|
||||
```
|
||||
|
||||
+29
-5
@@ -26,6 +26,13 @@ VENV_DIR="$EVECTION_HOME/venv"
|
||||
EVECTION_USER="${EVECTION_USER:-evection}"
|
||||
PYTHON_BIN="${PYTHON_BIN:-python3}"
|
||||
|
||||
# $APP_DIR ends up owned by $EVECTION_USER (see below), but the git steps
|
||||
# in this script run as root — without this, git refuses to touch a repo
|
||||
# it doesn't own ("detected dubious ownership"), which is exactly what
|
||||
# happens re-running this script after a previous run got far enough to
|
||||
# chown the checkout.
|
||||
git config --global --add safe.directory "$APP_DIR"
|
||||
|
||||
echo "==> Installing Evection"
|
||||
echo " App directory: $APP_DIR"
|
||||
echo " Service user: $EVECTION_USER"
|
||||
@@ -45,6 +52,11 @@ if [ "$PY_MAJOR" -lt 3 ] || { [ "$PY_MAJOR" -eq 3 ] && [ "$PY_MINOR" -lt 11 ]; }
|
||||
echo "Python $PY_VERSION found, but Evection needs 3.11 or newer." >&2
|
||||
exit 1
|
||||
fi
|
||||
if ! "$PYTHON_BIN" -c 'import ensurepip' >/dev/null 2>&1; then
|
||||
echo "'$PYTHON_BIN' can't create virtualenvs (no ensurepip) — on" \
|
||||
"Debian/Ubuntu, install it with: apt install python${PY_VERSION}-venv" >&2
|
||||
exit 1
|
||||
fi
|
||||
|
||||
for bin in redis-cli nginx; do
|
||||
if ! command -v "$bin" >/dev/null 2>&1; then
|
||||
@@ -61,23 +73,35 @@ if ! id -u "$EVECTION_USER" >/dev/null 2>&1; then
|
||||
else
|
||||
echo "==> System user '$EVECTION_USER' already exists"
|
||||
fi
|
||||
chown -R "$EVECTION_USER:$EVECTION_USER" "$APP_DIR"
|
||||
|
||||
# --- 2b. Pin to the latest release tag (if any exist) ----------------
|
||||
|
||||
#
|
||||
# Run as root (this script already requires it), not as $EVECTION_USER:
|
||||
# this repo was typically cloned by root (or whoever has git credentials
|
||||
# configured), and the service user has no reason to have its own git
|
||||
# auth set up. GIT_TERMINAL_PROMPT=0 means a credential problem fails
|
||||
# fast instead of hanging the install on a silent username/password
|
||||
# prompt.
|
||||
if [ -d "$APP_DIR/.git" ]; then
|
||||
sudo -u "$EVECTION_USER" -H git -C "$APP_DIR" fetch --tags --force || true
|
||||
LATEST_TAG="$(sudo -u "$EVECTION_USER" -H git -C "$APP_DIR" tag --sort=-creatordate | head -n1)"
|
||||
GIT_TERMINAL_PROMPT=0 git -C "$APP_DIR" fetch --tags --force || true
|
||||
LATEST_TAG="$(git -C "$APP_DIR" tag --sort=-creatordate | head -n1)"
|
||||
if [ -n "$LATEST_TAG" ]; then
|
||||
echo "==> Checking out latest release: $LATEST_TAG"
|
||||
# Detached HEAD, not a branch checkout — matches scripts/upgrade.sh,
|
||||
# which only ever deploys a tagged release, never a branch tip.
|
||||
sudo -u "$EVECTION_USER" -H git -C "$APP_DIR" checkout --quiet --detach "$LATEST_TAG"
|
||||
git -C "$APP_DIR" checkout --quiet --detach "$LATEST_TAG"
|
||||
else
|
||||
echo "==> No release tags found yet — staying on whatever's currently checked out."
|
||||
fi
|
||||
fi
|
||||
|
||||
# Everything under $EVECTION_HOME (not just $APP_DIR — the venv created
|
||||
# below lives next to it, not inside it) needs to belong to the service
|
||||
# user, whether $EVECTION_HOME already existed (e.g. you mkdir'd it
|
||||
# yourself before cloning) or adduser just created it.
|
||||
chown "$EVECTION_USER:$EVECTION_USER" "$EVECTION_HOME"
|
||||
chown -R "$EVECTION_USER:$EVECTION_USER" "$APP_DIR"
|
||||
|
||||
# --- 3. Virtualenv + install ---------------------------------------------
|
||||
|
||||
if [ ! -d "$VENV_DIR" ]; then
|
||||
|
||||
+14
-4
@@ -28,6 +28,11 @@ VENV_DIR="$EVECTION_HOME/venv"
|
||||
EVECTION_USER="${EVECTION_USER:-evection}"
|
||||
SOCKET="/run/evection/gunicorn.sock"
|
||||
|
||||
# $APP_DIR is owned by $EVECTION_USER, but the git steps below run as
|
||||
# root — without this, git refuses to touch a repo it doesn't own
|
||||
# ("detected dubious ownership").
|
||||
git config --global --add safe.directory "$APP_DIR"
|
||||
|
||||
if ! id -u "$EVECTION_USER" >/dev/null 2>&1; then
|
||||
echo "System user '$EVECTION_USER' doesn't exist — is Evection installed?" \
|
||||
"Run scripts/install.sh first." >&2
|
||||
@@ -46,14 +51,18 @@ fi
|
||||
|
||||
echo "==> Fetching latest release"
|
||||
cd "$APP_DIR"
|
||||
sudo -u "$EVECTION_USER" -H git fetch --tags --force
|
||||
LATEST_TAG="$(sudo -u "$EVECTION_USER" -H git tag --sort=-creatordate | head -n1)"
|
||||
# Run git as root (this script already requires it), not as $EVECTION_USER:
|
||||
# the service user has no reason to have its own git credentials set up,
|
||||
# and GIT_TERMINAL_PROMPT=0 means a credential problem fails fast instead
|
||||
# of hanging the upgrade on a silent username/password prompt.
|
||||
GIT_TERMINAL_PROMPT=0 git fetch --tags --force
|
||||
LATEST_TAG="$(git tag --sort=-creatordate | head -n1)"
|
||||
if [ -z "$LATEST_TAG" ]; then
|
||||
echo "No tags found in this repo — nothing to deploy." \
|
||||
"Cut and push a release tag first (e.g. git tag v$(date +%Y.%m.%d) && git push --tags)." >&2
|
||||
exit 1
|
||||
fi
|
||||
CURRENT_REF="$(sudo -u "$EVECTION_USER" -H git describe --tags --exact-match 2>/dev/null || echo "none")"
|
||||
CURRENT_REF="$(git describe --tags --exact-match 2>/dev/null || echo "none")"
|
||||
if [ "$CURRENT_REF" = "$LATEST_TAG" ]; then
|
||||
echo "Already on the latest tag ($LATEST_TAG) — nothing to do."
|
||||
exit 0
|
||||
@@ -61,7 +70,8 @@ fi
|
||||
echo "Deploying $LATEST_TAG (currently on: $CURRENT_REF)"
|
||||
# Detached HEAD, not a branch checkout — this directory only ever runs a
|
||||
# tagged release, never whatever the default branch's tip happens to be.
|
||||
sudo -u "$EVECTION_USER" -H git checkout --quiet --detach "$LATEST_TAG"
|
||||
git checkout --quiet --detach "$LATEST_TAG"
|
||||
chown -R "$EVECTION_USER:$EVECTION_USER" "$APP_DIR"
|
||||
|
||||
echo "==> Installing updated dependencies"
|
||||
sudo -u "$EVECTION_USER" -H "$VENV_DIR/bin/pip" install --upgrade "$APP_DIR"
|
||||
|
||||
Reference in new issue
Block a user