diff --git a/README.md b/README.md index 6077c8b..ee203da 100644 --- a/README.md +++ b/README.md @@ -14,13 +14,14 @@ no local copy of the repo required on the host. So the management container never creates LXCs; it only updates, monitors and backs up what these scripts provisioned. -## Repo layout (Forgejo — org `proxmox-helpers`) +## Repo layout (Forgejo — owner `jtr`) -Property-neutral names, since the stack deploys at multiple hotels: +All repos are private, under user `jtr` at `git.pterois.co.uk`. Property-neutral +names, since the stack deploys at multiple hotels: | Repo | Contents | Provisioned to | |------|----------|----------------| -| `stack` | Installer scripts + `docs/` + `infrastructure/` reference | run on the Proxmox host | +| `proxmox-helpers` | Installer scripts + `docs/` + `infrastructure/` reference | run on the Proxmox host | | `auth` | central auth service | LXC 101 | | `portal` | PWA portal shell | LXC 102 | | `management` | updater + Kuma + backup | LXC 105 | @@ -30,9 +31,8 @@ Property-neutral names, since the stack deploys at multiple hotels: Postgres (LXC 100) and NPM (LXC 103) have no repo — the installer generates their compose files inline (they carry secrets / are pure infra). -> Owner assumed to be a Forgejo org named `proxmox-helpers`. If your repos live -> under a user account or a different org, adjust the URLs below and the -> `FORGEJO_BASE` default in the wizard. +> Repos live under user `jtr` (there are no Forgejo orgs). The `FORGEJO_BASE` +> default in the wizard is `https://git.pterois.co.uk/jtr`. ## One-time host prep @@ -55,14 +55,14 @@ On the Proxmox host shell (as root): **Public repo:** ```bash -bash <(curl -fsSL https://git.pterois.co.uk/proxmox-helpers/stack/raw/branch/main/install-stack.sh) +bash <(curl -fsSL https://git.pterois.co.uk/jtr/proxmox-helpers/raw/branch/main/install-stack.sh) ``` **Private repo** (raw fetch needs the same token you'll paste into the wizard): ```bash TOKEN=xxxxxxxx bash <(curl -fsSL -H "Authorization: token $TOKEN" \ - https://git.pterois.co.uk/proxmox-helpers/stack/raw/branch/main/install-stack.sh) + https://git.pterois.co.uk/jtr/proxmox-helpers/raw/branch/main/install-stack.sh) ``` The wizard collects site name, domain, NPM LAN IP/gateway, office IP for @@ -80,7 +80,7 @@ On the Proxmox host (again, because it creates an LXC): ```bash bash <(curl -fsSL -H "Authorization: token $TOKEN" \ - https://git.pterois.co.uk/proxmox-helpers/stack/raw/branch/main/add-app.sh) + https://git.pterois.co.uk/jtr/proxmox-helpers/raw/branch/main/add-app.sh) ``` Reads `/root/hnf-credentials.txt` for the shared secret, Forgejo token and diff --git a/add-app.sh b/add-app.sh index 5229777..ebfce85 100755 --- a/add-app.sh +++ b/add-app.sh @@ -61,7 +61,7 @@ if whiptail --title "Add App LXC" --yesno \ USE_FORGEJO=true FORGEJO_REPO=$(whiptail --title "Add App LXC" \ --inputbox "Full Forgejo repo URL (.git):" 8 70 \ - "${FORGEJO_BASE:-https://git.pterois.co.uk/proxmox-helpers}/${APP_NAME}.git" \ + "${FORGEJO_BASE:-https://git.pterois.co.uk/jtr}/${APP_NAME}.git" \ 3>&1 1>&2 2>&3) || exit 0 else USE_FORGEJO=false diff --git a/install-stack.sh b/install-stack.sh index 326dd64..9e3a996 100755 --- a/install-stack.sh +++ b/install-stack.sh @@ -7,7 +7,7 @@ # │ bash install-stack.sh │ # │ │ # │ Or from Forgejo once repos are pushed: │ -# │ bash <(curl -fsSL https://git.pterois.co.uk/proxmox-helpers/stack/raw/branch/main/install-stack.sh) +# │ bash <(curl -fsSL https://git.pterois.co.uk/jtr/proxmox-helpers/raw/branch/main/install-stack.sh) # └─────────────────────────────────────────────────────────────────────────┘ set -euo pipefail @@ -131,8 +131,8 @@ Type 'disabled' to allow access from anywhere:" \ Each service is cloned from /.git → auth portal management noticeboard -Example: https://git.pterois.co.uk/proxmox-helpers" \ - 13 66 "https://git.pterois.co.uk/proxmox-helpers" 3>&1 1>&2 2>&3) || exit 0 +Example: https://git.pterois.co.uk/jtr" \ + 13 66 "https://git.pterois.co.uk/jtr" 3>&1 1>&2 2>&3) || exit 0 FORGEJO_BASE="${FORGEJO_BASE%/}" FORGEJO_TOKEN=$(whiptail --title "HNF Stack — Forgejo Token" \ @@ -789,7 +789,7 @@ SUMMARY Events: Push 5. To add an app LXC later, on this host run: - bash <(curl -fsSL https://git.pterois.co.uk/proxmox-helpers/stack/raw/branch/main/add-app.sh) + bash <(curl -fsSL https://git.pterois.co.uk/jtr/proxmox-helpers/raw/branch/main/add-app.sh) SUMMARY }