johba/disinto
1
0
Fork 0
Code Issues 4 Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request 'fix: fix: .env contains harb-specific defaults that leak into non-harb sessions (#398)' (#399) from fix/issue-398 into main

Browse source 
Reviewed-on: https://codeberg.org/johba/disinto/pulls/399
Reviewed-by: Disinto_bot <disinto_bot@noreply.codeberg.org>
This commit is contained in:
johba 2026-03-20 16:38:30 +01:00
commit 1fb6f0a032
2 changed files with 8 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

11
.env.example
View file

@ -2,11 +2,10 @@
# Copy to .env and fill in your values. # Copy to .env and fill in your values.
# NEVER commit .env to the repo. # NEVER commit .env to the repo.
# ── Target project ──────────────────────────────────────────────────────── # ── Per-project config ────────────────────────────────────────────────────
CODEBERG_REPO=johba/yourproject # org/repo slug on Codeberg # Project-specific settings (CODEBERG_REPO, PROJECT_REPO_ROOT, PRIMARY_BRANCH,
PROJECT_REPO_ROOT=/home/you/yourproject # local clone of the target repo # WOODPECKER_REPO_ID) now live in projects/*.toml — see projects/harb.toml
PRIMARY_BRANCH=main # main or master # for an example. Do NOT set them here; they leak into every session.
# PROJECT_NAME=yourproject # optional — auto-derived from CODEBERG_REPO
# ── Auth tokens ─────────────────────────────────────────────────────────── # ── Auth tokens ───────────────────────────────────────────────────────────
# Dev-agent token: push branches, create PRs, merge PRs. # Dev-agent token: push branches, create PRs, merge PRs.
@ -22,7 +21,7 @@ REVIEW_BOT_TOKEN=
# ── Woodpecker CI ───────────────────────────────────────────────────────── # ── Woodpecker CI ─────────────────────────────────────────────────────────
WOODPECKER_TOKEN= WOODPECKER_TOKEN=
WOODPECKER_SERVER=http://localhost:8000 WOODPECKER_SERVER=http://localhost:8000
WOODPECKER_REPO_ID=2 # numeric repo ID in Woodpecker DB # WOODPECKER_REPO_ID — now per-project, set in projects/*.toml [ci] section
# Woodpecker Postgres (for direct DB queries) # Woodpecker Postgres (for direct DB queries)
WOODPECKER_DB_PASSWORD= WOODPECKER_DB_PASSWORD=

7
lib/env.sh
View file

@ -31,14 +31,13 @@ fi
export CODEBERG_TOKEN export CODEBERG_TOKEN
# Project config # Project config
export CODEBERG_REPO="${CODEBERG_REPO:-johba/harb}" export CODEBERG_REPO="${CODEBERG_REPO:-}"
export CODEBERG_API="${CODEBERG_API:-https://codeberg.org/api/v1/repos/${CODEBERG_REPO}}" export CODEBERG_API="${CODEBERG_API:-https://codeberg.org/api/v1/repos/${CODEBERG_REPO}}"
export CODEBERG_WEB="https://codeberg.org/${CODEBERG_REPO}" export CODEBERG_WEB="https://codeberg.org/${CODEBERG_REPO}"
export PROJECT_NAME="${PROJECT_NAME:-${CODEBERG_REPO##*/}}" export PROJECT_NAME="${PROJECT_NAME:-${CODEBERG_REPO##*/}}"
export PROJECT_REPO_ROOT="${PROJECT_REPO_ROOT:-${HARB_REPO_ROOT:-/home/${USER}/${PROJECT_NAME}}}" export PROJECT_REPO_ROOT="${PROJECT_REPO_ROOT:-/home/${USER}/${PROJECT_NAME}}"
export HARB_REPO_ROOT="${PROJECT_REPO_ROOT}" # deprecated alias
export PRIMARY_BRANCH="${PRIMARY_BRANCH:-master}" export PRIMARY_BRANCH="${PRIMARY_BRANCH:-master}"
export WOODPECKER_REPO_ID="${WOODPECKER_REPO_ID:-2}" export WOODPECKER_REPO_ID="${WOODPECKER_REPO_ID:-}"
export WOODPECKER_SERVER="${WOODPECKER_SERVER:-http://localhost:8000}" export WOODPECKER_SERVER="${WOODPECKER_SERVER:-http://localhost:8000}"
export CLAUDE_TIMEOUT="${CLAUDE_TIMEOUT:-7200}" export CLAUDE_TIMEOUT="${CLAUDE_TIMEOUT:-7200}"