Compare commits
14 Commits
v0.1.0
...
f865660c7c
| Author | SHA1 | Date | |
|---|---|---|---|
| f865660c7c | |||
| 2285fff759 | |||
| ead105d5bf | |||
| 1996a32153 | |||
| 65998692ae | |||
| 094da1776b | |||
| 188e6eb882 | |||
| 9cc109910c | |||
| 6da385425e | |||
| 5d4c68eaf5 | |||
| c3771d22f2 | |||
| 6c49217e9c | |||
| 7758724eb5 | |||
| 484f00ddee |
@@ -165,6 +165,39 @@ jobs:
|
||||
fi
|
||||
fi
|
||||
|
||||
# ── Orphan sweep ────────────────────────────────────────────────
|
||||
#
|
||||
# The check above is VERSION-SCOPED: it only ever asks about the one
|
||||
# version this run computed. That is enough to recover an orphan on
|
||||
# the very next run, and useless afterwards — once any releasable
|
||||
# commit lands, the next run computes a NEW version, never looks at
|
||||
# the old tag again, and the orphan becomes permanent and silent.
|
||||
#
|
||||
# servuo-plugins v0.1.0 is the proof, and the proof is pointed: the
|
||||
# commit that ADDED the recovery above was itself typed
|
||||
# `fix(release): ... recover the orphaned v0.1.0 tag`, so it bumped to
|
||||
# v0.1.1 — and the run that introduced the recovery stepped straight
|
||||
# past the tag it was written to rescue. That tag is still orphaned.
|
||||
#
|
||||
# So every v* tag is checked, and anything missing a release is
|
||||
# WARNED about. Deliberately not recovered: publishing an old version
|
||||
# would mean building today's tree and shipping it under a tag whose
|
||||
# tree it is not, which is worse than the inconsistency it fixes.
|
||||
# A human decides whether to recover or drop it.
|
||||
#
|
||||
# Never fails the run. A sweep that can break a good release is a
|
||||
# sweep someone will delete.
|
||||
ORPHANS=""
|
||||
for T in $(git tag -l 'v*' --sort=-v:refname); do
|
||||
T_HTTP="$(curl -s -o /dev/null -w '%{http_code}' \
|
||||
-H "Authorization: token $(printf '%s' "${REGISTRY_TOKEN:-}" | tr -d '\r\n')" \
|
||||
"https://${GITEA_HOST}/api/v1/repos/${REPO}/releases/tags/${T}" || echo 000)"
|
||||
[ "$T_HTTP" = "404" ] && ORPHANS="${ORPHANS} ${T}"
|
||||
done
|
||||
if [ -n "${ORPHANS}" ]; then
|
||||
echo "::warning::Tags with no release:${ORPHANS} — a run failed after tagging. Publish or delete them; this job will not do either."
|
||||
fi
|
||||
|
||||
# Changelog range. A recovery run has nothing after the tag, so
|
||||
# summarize what the tag itself contains rather than emitting an empty
|
||||
# list: the range that produced it, i.e. previous-tag..this-tag.
|
||||
@@ -395,17 +428,74 @@ jobs:
|
||||
# corrupt the Authorization header.
|
||||
CI_TOKEN="$(printf '%s' "${REGISTRY_TOKEN}" | tr -d '\r\n')"
|
||||
|
||||
REL_ID="$(curl -sSf -X POST "${API}/releases" \
|
||||
-H "Authorization: token ${CI_TOKEN}" \
|
||||
-H "Content-Type: application/json" \
|
||||
-d "$(jq -n --arg tag "$TAG" --arg body "$BODY" \
|
||||
'{tag_name:$tag, name:$tag, body:$body, draft:false, prerelease:false}')" \
|
||||
| jq -r '.id')"
|
||||
PAYLOAD="$(jq -n --arg tag "$TAG" --arg body "$BODY" \
|
||||
'{tag_name:$tag, name:$tag, body:$body, draft:false, prerelease:false}')"
|
||||
|
||||
# This POST is the step that orphaned tag v0.1.1 (run 75): it landed one
|
||||
# second after the tag push and Gitea answered 500, having not finished
|
||||
# processing the pushed tag. Re-running the workflow published the same
|
||||
# four assets untouched, so the failure was a race, not a bad request.
|
||||
#
|
||||
# Two things went wrong there, and both are fixed here.
|
||||
#
|
||||
# 1. `curl -sSf` prints NO response body on an error status, so all the
|
||||
# log carried was "curl: (22) ... error: 500" and the cause had to be
|
||||
# inferred from timestamps. Capture the body and print it.
|
||||
# 2. Nothing retried, so a transient 5xx became a permanent orphan tag.
|
||||
# The plan step CAN recover one, but only on a run that reaches it --
|
||||
# and a later push with no releasable commits stands down before it
|
||||
# gets there, so in practice the tag sits until a human notices.
|
||||
#
|
||||
# 4xx is deliberately NOT retried: a bad token or a malformed body does
|
||||
# not improve by being sent again, and retrying only turns a clear
|
||||
# failure into a slow one.
|
||||
REL_ID=""
|
||||
for attempt in 1 2 3 4 5; do
|
||||
HTTP="$(curl -s -o /tmp/rel.json -w '%{http_code}' -X POST "${API}/releases" \
|
||||
-H "Authorization: token ${CI_TOKEN}" \
|
||||
-H "Content-Type: application/json" \
|
||||
-d "${PAYLOAD}" || echo 000)"
|
||||
|
||||
if [ "$HTTP" = "201" ] || [ "$HTTP" = "200" ]; then
|
||||
REL_ID="$(jq -r '.id' /tmp/rel.json)"
|
||||
break
|
||||
fi
|
||||
|
||||
echo "::warning::POST /releases attempt ${attempt} returned HTTP ${HTTP}"
|
||||
echo "--- response body ---"
|
||||
cat /tmp/rel.json || true
|
||||
echo
|
||||
echo "---------------------"
|
||||
|
||||
case "$HTTP" in
|
||||
4*) echo "::error::HTTP ${HTTP} is a client error - not retrying."; exit 1 ;;
|
||||
esac
|
||||
|
||||
if [ "$attempt" = 5 ]; then
|
||||
echo "::error::POST /releases still failing after 5 attempts. Tag ${TAG} is pushed but has no release."
|
||||
echo "::error::Re-run this workflow - the plan step detects the orphan tag and republishes it."
|
||||
exit 1
|
||||
fi
|
||||
sleep $(( attempt * 5 ))
|
||||
done
|
||||
|
||||
if [ -z "$REL_ID" ] || [ "$REL_ID" = "null" ]; then
|
||||
echo "::error::Release created but no id came back; refusing to upload assets blind."
|
||||
exit 1
|
||||
fi
|
||||
echo "Created release ${TAG} (id=${REL_ID})"
|
||||
|
||||
for f in "${BIN}-linux-x86_64" "${BIN}-linux-aarch64" "${BIN}-windows-x86_64.exe" SHA256SUMS; do
|
||||
curl -sSf -X POST "${API}/releases/${REL_ID}/assets?name=${f}" \
|
||||
# Same treatment. An upload that fails quietly leaves a release whose
|
||||
# SHA256SUMS does not cover every binary it advertises, which is worse
|
||||
# than no release at all -- that file IS the trust anchor.
|
||||
HTTP="$(curl -s -o /tmp/asset.json -w '%{http_code}' -X POST "${API}/releases/${REL_ID}/assets?name=${f}" \
|
||||
-H "Authorization: token ${CI_TOKEN}" \
|
||||
-F "attachment=@dist/${f}" >/dev/null
|
||||
-F "attachment=@dist/${f}" || echo 000)"
|
||||
if [ "$HTTP" != "201" ] && [ "$HTTP" != "200" ]; then
|
||||
echo "::error::uploading ${f} returned HTTP ${HTTP}"
|
||||
cat /tmp/asset.json || true
|
||||
exit 1
|
||||
fi
|
||||
echo " uploaded ${f}"
|
||||
done
|
||||
|
||||
84
README.md
84
README.md
@@ -25,9 +25,48 @@ It also **does not replace ServUO startup behavior.** ServUO keeps running throu
|
||||
its existing release/start scripts; the installer never writes a launcher and
|
||||
never restarts the shard.
|
||||
|
||||
## Install a shard with it
|
||||
|
||||
Grab a binary and `SHA256SUMS` from the
|
||||
[releases page](https://gitea.whitlocktech.com/RunicGateway/installer/releases),
|
||||
verify the checksum, and run it as Administrator/root against a **stopped** shard:
|
||||
|
||||
```bash
|
||||
sha256sum -c SHA256SUMS --ignore-missing
|
||||
chmod +x runicgateway-installer-linux-x86_64
|
||||
sudo ./runicgateway-installer-linux-x86_64 install
|
||||
```
|
||||
|
||||
```powershell
|
||||
# Windows, from an elevated PowerShell
|
||||
.\runicgateway-installer-windows-x86_64.exe install
|
||||
```
|
||||
|
||||
It ends by printing the four values to paste into **Admin → Shard** on your site.
|
||||
The full operator guide — what it asks, where it writes, the patch tier, day-two
|
||||
commands and troubleshooting — is
|
||||
[`installer/INSTALL.md`](https://gitea.whitlocktech.com/RunicGateway/docs/src/branch/main/installer/INSTALL.md).
|
||||
|
||||
Prefer to place everything yourself, or on a host that cannot run the binary?
|
||||
[INSTALL.md Appendix A](https://gitea.whitlocktech.com/RunicGateway/docs/src/branch/main/installer/INSTALL.md#appendix-a--installing-by-hand)
|
||||
is the same deployment done with `curl`, `tar` and `systemctl`, and stays
|
||||
supported.
|
||||
|
||||
## Status
|
||||
|
||||
**Phases 1 to 4 are built, on the `edge` branch. Nothing is released yet.**
|
||||
**Released.** All five phases are built and the `edge → main` cutover (#17) cut
|
||||
the first release, [`v0.1.0`](https://gitea.whitlocktech.com/RunicGateway/installer/releases),
|
||||
publishing `linux-x86_64`, `linux-aarch64` and `windows-x86_64.exe` with
|
||||
`SHA256SUMS`.
|
||||
|
||||
| Phase | State |
|
||||
|---|---|
|
||||
| 0 — prerequisites in the other repos | ✅ merged |
|
||||
| 1 — installer core: bundle resolution, ServUO detection, overlay sync, `install.json` | ✅ released |
|
||||
| 2 — uo-link install + service registration | ✅ released |
|
||||
| 3 — the opt-in stock-file patch tier | ✅ released |
|
||||
| 4 — `doctor`, `update`, `uninstall` | ✅ released |
|
||||
| 5 — packaging polish: Linux `aarch64`, backup before overwrite | ✅ released |
|
||||
|
||||
The binary does everything
|
||||
[`installer/INSTALL.md`](https://gitea.whitlocktech.com/RunicGateway/docs/src/branch/main/installer/INSTALL.md)
|
||||
@@ -40,39 +79,18 @@ The design of record is
|
||||
in the docs repo: phases, locked decisions, and the Phase 0 prerequisites in other
|
||||
repos (a `servuo-plugins` release workflow, a non-interactive config read-back in
|
||||
`link`, and the bundle-manifest CI here), all of which have landed —
|
||||
[`bundles/current.json`](bundles/current.json) names the current protocol-checked
|
||||
sidecar + overlay combination, recomposed on every component release and nightly
|
||||
(see [`bundles/README.md`](bundles/README.md)).
|
||||
[`bundles/current.json`](https://gitea.whitlocktech.com/RunicGateway/installer/src/branch/bundles/current.json)
|
||||
names the current protocol-checked sidecar + overlay combination, recomposed on
|
||||
every component release and nightly (see [`bundles/README.md`](bundles/README.md)).
|
||||
|
||||
| Phase | State |
|
||||
|---|---|
|
||||
| 0 — prerequisites in the other repos | ✅ merged |
|
||||
| 1 — installer core: bundle resolution, ServUO detection, overlay sync, `install.json` | ✅ on `edge` |
|
||||
| 2 — uo-link install + service registration | ✅ on `edge` |
|
||||
| 3 — the opt-in stock-file patch tier | ✅ on `edge` |
|
||||
| 4 — `doctor`, `update`, `uninstall` | ✅ on `edge` |
|
||||
| 5 — packaging polish: Linux `aarch64`, backup before overwrite | in progress |
|
||||
|
||||
**Why `edge`:** `release.yml` publishes an installer binary on every push to
|
||||
`main`, so nothing lands there until the whole tool is worth handing to an
|
||||
operator. The `edge → main` cutover cuts the first release. PRs into `edge` run
|
||||
the same gates as PRs into `main`.
|
||||
|
||||
**What the cutover is waiting on**, per PLAN.md §5:
|
||||
|
||||
1. **Phase 5**, packaging polish — deliberately *before* the first release rather
|
||||
than after it, because it changes the release layout, and shipping first would
|
||||
mean a first release immediately superseded by the next. There is no `.deb`
|
||||
and no MSI: both would give the sidecar binary, its service unit and its
|
||||
service account a second owner beside this tool.
|
||||
2. **The Windows SCM half verified on a real host.** `sc create`, the virtual
|
||||
service account, the failure actions and the token-file ACL have never been
|
||||
executed anywhere. Running the *systemd* half for real is what turned up a bug
|
||||
no unit test had, so this is not a formality.
|
||||
|
||||
Until the cutover, the way to install is by hand —
|
||||
[INSTALL.md Appendix A](https://gitea.whitlocktech.com/RunicGateway/docs/src/branch/main/installer/INSTALL.md#appendix-a--installing-by-hand)
|
||||
is the same deployment done with `curl`, `tar` and `systemctl`.
|
||||
**`main` publishes.** `release.yml` cuts a release from every push to `main`, which
|
||||
is why the crate was integrated on `edge` until it was worth handing to an
|
||||
operator. Both cutover gates were met first: Phase 5 (its scope settled as **no
|
||||
`.deb` and no MSI** — either would give the sidecar binary, its service unit and
|
||||
its service account a second owner beside this tool), and the **Windows SCM half
|
||||
verified on a real host**. That second one earned its place: `sc start` failed
|
||||
with 1053 on its first real run and needed a sidecar fix (link#29) before it
|
||||
passed 13/13.
|
||||
|
||||
## Related repos
|
||||
|
||||
|
||||
@@ -3,10 +3,27 @@
|
||||
//! ## Scoped by what cannot be fetched again
|
||||
//!
|
||||
//! Most of what this installer writes is replaceable: the sidecar binary and every overlay file are
|
||||
//! re-downloadable and hash-named in the bundle, and the sidecar's database is a cache with a schema
|
||||
//! — `link`'s `store.rs` creates every table `IF NOT EXISTS` and every one of them holds shard state
|
||||
//! the sweeps repopulate. Backing those up would be bulk with no recovery value, and the bulk is not
|
||||
//! free: it would bury the two things that matter.
|
||||
//! re-downloadable and hash-named in the bundle, and the sidecar's database is overwhelmingly a
|
||||
//! projection of shard state that the sweeps repopulate. Backing it up would be bulk with little
|
||||
//! recovery value, and the bulk is not free: it would bury the two things that matter.
|
||||
//!
|
||||
//! That reasoning used to be stated two ways that are no longer true, and the correction is worth
|
||||
//! keeping rather than quietly deleting:
|
||||
//!
|
||||
//! - It said the database is safe because `store.rs` creates every table `IF NOT EXISTS`. That held
|
||||
//! only while every schema change added a whole *table*. Protocol 4 adds a *column* to a table
|
||||
//! that already exists, which `IF NOT EXISTS` cannot do, so `link` now carries a real migration
|
||||
//! (`PRAGMA user_version` steps). A run can therefore change the database's structure, not just
|
||||
//! its contents.
|
||||
//! - It said every table holds state the sweeps repopulate. `events` does not: it is never pruned,
|
||||
//! and the website backfills the events it missed from `GET /history` on every reconnect. So a
|
||||
//! lost database costs the gap-recovery window for anything that happened while the site was down.
|
||||
//!
|
||||
//! The decision is unchanged — this still does not copy the database — because the argument against
|
||||
//! backing up unbounded bulk survives both corrections: `events` grows without limit, the migration
|
||||
//! is transactional and additive, and the website holds its own durable copy of everything it has
|
||||
//! already ingested. Only the *reason* was wrong. Whether that table should be pruned or protected
|
||||
//! is a question for `link`, on its own merits, not something to settle inside a backup policy.
|
||||
//!
|
||||
//! What a run can destroy irrecoverably is short:
|
||||
//!
|
||||
|
||||
@@ -77,7 +77,7 @@ pub struct Cli {
|
||||
pub patches_unsupported_servuo: bool,
|
||||
/// `--host <name>`: the hostname to print in the website URLs.
|
||||
pub host: Option<String>,
|
||||
/// `--site-url <url>`: the site's base URL, for the Admin → Shard link.
|
||||
/// `--site-url <url>`: the site's base URL, for the Admin → Shard (uo-link) link.
|
||||
pub site_url: Option<String>,
|
||||
/// `--yes`: assume the default answer to every prompt.
|
||||
pub assume_yes: bool,
|
||||
@@ -137,7 +137,7 @@ Options:
|
||||
--host <NAME> install. The hostname to print in the
|
||||
website URLs.
|
||||
--site-url <URL> install. Your site's base URL, for the
|
||||
Admin → Shard link.
|
||||
Admin → Shard (uo-link) link.
|
||||
--yes Assume the default answer to every prompt.
|
||||
On uninstall it means yes: that prompt
|
||||
defaults to no, and typing `uninstall
|
||||
|
||||
104
src/doctor.rs
104
src/doctor.rs
@@ -158,6 +158,10 @@ pub fn run(cli: &Cli) -> Result<i32> {
|
||||
// ── The bundle ───────────────────────────────────────────────────────────
|
||||
rows.push(bundle_row(&record));
|
||||
|
||||
// ── The host ─────────────────────────────────────────────────────────────
|
||||
// Linux only, and absent entirely elsewhere (see `imaging_row`).
|
||||
rows.extend(imaging_row());
|
||||
|
||||
// ── Backups ──────────────────────────────────────────────────────────────
|
||||
rows.push(backup_row(&layout));
|
||||
|
||||
@@ -755,6 +759,71 @@ fn bundle_row(record: &InstallRecord) -> Row {
|
||||
Row::warn("Bundle", detail).note("run `update` to move both halves to one checked combination")
|
||||
}
|
||||
|
||||
/// `libgdiplus` on a Linux shard host — the one host prerequisite the Asset Bridge added
|
||||
/// (docs/link/v8.md §4.4, docs/link/SHARD_PREREQS.md).
|
||||
///
|
||||
/// ServUO targets `net48`, so on Linux it runs under Mono, and Mono's `System.Drawing` is a thin
|
||||
/// layer over this library — which sits in the **decode** path, not merely the encode: without it
|
||||
/// the shard cannot read a single sprite out of the operator's UO client. Windows hosts ship
|
||||
/// `System.Drawing` with .NET Framework and need nothing, which is why this row exists only on
|
||||
/// Linux rather than reporting "not applicable" on three quarters of the hosts that run it.
|
||||
///
|
||||
/// **A `⚠`, never a `✗`.** Everything else on this plane works without it: the cliloc table and
|
||||
/// the shard's own spawn files have no pixels in them, and a bridge that serves names and an atlas
|
||||
/// but no artwork is a working bridge with one feature missing. It is also not the last word — the
|
||||
/// shard reports `NO_IMAGING` on the asset plane itself, from inside the process that would do the
|
||||
/// decoding. This row exists to move that discovery from "the bestiary is empty, weeks later" to
|
||||
/// "the host is missing a package, now".
|
||||
#[cfg(target_os = "linux")]
|
||||
fn imaging_row() -> Option<Row> {
|
||||
Some(imaging_verdict(imaging_present()))
|
||||
}
|
||||
|
||||
/// Is the library on this host? Two answers, in the order that is most likely to be right.
|
||||
#[cfg(target_os = "linux")]
|
||||
fn imaging_present() -> bool {
|
||||
// `ldconfig -p` is the loader's own cache, which is the same question Mono asks at runtime —
|
||||
// strictly better than probing paths, because a distro that puts the file somewhere unusual has
|
||||
// told the loader about it and would otherwise read here as missing.
|
||||
let cached = crate::util::run("ldconfig", &["-p"])
|
||||
.ok()
|
||||
.map(|o| String::from_utf8_lossy(&o.stdout).contains("libgdiplus.so"))
|
||||
.unwrap_or(false);
|
||||
|
||||
// The fallback is for a host with no `ldconfig` on PATH (a slim container, mostly), where a
|
||||
// present library would otherwise be reported absent.
|
||||
cached
|
||||
|| [
|
||||
"/usr/lib/libgdiplus.so",
|
||||
"/usr/lib64/libgdiplus.so",
|
||||
"/usr/lib/x86_64-linux-gnu/libgdiplus.so",
|
||||
"/usr/lib/aarch64-linux-gnu/libgdiplus.so",
|
||||
"/usr/local/lib/libgdiplus.so",
|
||||
]
|
||||
.iter()
|
||||
.any(|p| Path::new(p).exists())
|
||||
}
|
||||
|
||||
/// The operator-visible half, split out so the wording and the mark are testable on a host that
|
||||
/// has the library and on one that does not — which the detection itself is not.
|
||||
#[cfg(target_os = "linux")]
|
||||
fn imaging_verdict(found: bool) -> Row {
|
||||
if found {
|
||||
return Row::ok("Imaging (libgdiplus)", "present");
|
||||
}
|
||||
Row::warn("Imaging (libgdiplus)", "not found on this host")
|
||||
.note("this shard cannot decode artwork out of its UO client — creature portraits and")
|
||||
.note("item pictures will be absent; names and the spawn atlas are unaffected")
|
||||
.note("install it: apt-get install libgdiplus / dnf install libgdiplus")
|
||||
.note("see docs/link/SHARD_PREREQS.md — Windows hosts need nothing")
|
||||
}
|
||||
|
||||
/// Windows and macOS hosts do not need it, so there is no row to print.
|
||||
#[cfg(not(target_os = "linux"))]
|
||||
fn imaging_row() -> Option<Row> {
|
||||
None
|
||||
}
|
||||
|
||||
#[cfg(test)]
|
||||
mod tests {
|
||||
use super::*;
|
||||
@@ -913,4 +982,39 @@ mod tests {
|
||||
assert_eq!(row.mark, Mark::Ok);
|
||||
assert!(row.detail.contains("operator-owned"), "{}", row.detail);
|
||||
}
|
||||
|
||||
// ── The host row (Linux only; see `imaging_row`) ─────────────────────────
|
||||
|
||||
#[cfg(target_os = "linux")]
|
||||
#[test]
|
||||
fn a_missing_libgdiplus_warns_and_names_the_package() {
|
||||
let row = imaging_verdict(false);
|
||||
// A ⚠, never a ✗: the cliloc table and the spawn atlas have no pixels in them, so a host
|
||||
// without this library still runs a useful bridge. `doctor`'s exit code must not turn red
|
||||
// over one absent feature.
|
||||
assert_eq!(row.mark, Mark::Warn);
|
||||
let notes = row.notes.join(" ");
|
||||
assert!(notes.contains("apt-get install libgdiplus"), "{notes}");
|
||||
assert!(notes.contains("SHARD_PREREQS.md"), "{notes}");
|
||||
}
|
||||
|
||||
#[cfg(target_os = "linux")]
|
||||
#[test]
|
||||
fn a_present_libgdiplus_is_one_quiet_ok_line() {
|
||||
let row = imaging_verdict(true);
|
||||
assert_eq!(row.mark, Mark::Ok);
|
||||
assert!(
|
||||
row.notes.is_empty(),
|
||||
"a satisfied prerequisite needs no advice"
|
||||
);
|
||||
}
|
||||
|
||||
#[cfg(target_os = "linux")]
|
||||
#[test]
|
||||
fn detection_answers_rather_than_panicking_on_a_host_with_no_ldconfig() {
|
||||
// The value depends on the host and is not asserted — what is asserted is that a missing
|
||||
// `ldconfig` degrades to the path probe instead of taking `doctor` down, which is the rule
|
||||
// every row in this module follows.
|
||||
let _ = imaging_present();
|
||||
}
|
||||
}
|
||||
|
||||
@@ -294,6 +294,18 @@ fn port_of(bind: &str) -> &str {
|
||||
}
|
||||
}
|
||||
|
||||
/// Where the shard settings live in the website's admin panel.
|
||||
///
|
||||
/// NOT `/admin/shard`, which is what this printed until 2026-08-24 and what an operator who ran
|
||||
/// an older build still has in their scrollback. Those screens belong to the `uo` MODULE now, and
|
||||
/// a module owns one path segment wherever it appears (website `MODULE_SYSTEM.md` §2.8), so the
|
||||
/// page moved. The old path does not 404 — the SPA sends it to the dashboard, which is the worst
|
||||
/// way for a link in a handoff to be wrong, because it looks like it worked.
|
||||
///
|
||||
/// API routes are NOT affected by that rule and keep `/api/v1/admin/shard/*`. This is the SPA URL
|
||||
/// a person types.
|
||||
const ADMIN_SHARD_PATH: &str = "/admin/uo/link";
|
||||
|
||||
/// The end-of-run block from PLAN.md §6 — the one manual step the installer cannot do.
|
||||
///
|
||||
/// Returned as a string rather than printed so it can be tested, and so the caller decides where it
|
||||
@@ -312,12 +324,13 @@ pub fn handoff(doc: &ConfigDoc, host: &str, site_url: Option<&str>) -> String {
|
||||
Protocol version {protocol}\n \
|
||||
Auth token {token}\n \
|
||||
(also in {config})\n\n\
|
||||
Paste these into Admin → Shard on your Runic Gateway site:\n \
|
||||
{site}/admin/shard\n\n\
|
||||
Paste these into Admin → Shard (uo-link) on your Runic Gateway site:\n \
|
||||
{site}{admin_path}\n\n\
|
||||
The token is write-only once saved — the site will never show it back to you.\n",
|
||||
protocol = doc.protocol,
|
||||
token = doc.web.auth_token,
|
||||
config = doc.config_path,
|
||||
admin_path = ADMIN_SHARD_PATH,
|
||||
)
|
||||
}
|
||||
|
||||
@@ -401,7 +414,7 @@ mod tests {
|
||||
assert!(block.contains(&doc.web.auth_token), "{block}");
|
||||
// The trailing slash on the site URL must not produce a double slash in the link.
|
||||
assert!(
|
||||
block.contains("https://my-site.example/admin/shard"),
|
||||
block.contains("https://my-site.example/admin/uo/link"),
|
||||
"{block}"
|
||||
);
|
||||
assert!(block.contains("/etc/runicgateway/sidecar.toml"), "{block}");
|
||||
@@ -412,7 +425,10 @@ mod tests {
|
||||
// An unattended run has nobody to ask, and the token is far too useful to withhold over a
|
||||
// link the operator does not need.
|
||||
let block = handoff(&doc(), "shard", None);
|
||||
assert!(block.contains("https://<your-site>/admin/shard"), "{block}");
|
||||
assert!(
|
||||
block.contains("https://<your-site>/admin/uo/link"),
|
||||
"{block}"
|
||||
);
|
||||
assert!(block.contains("4f9c"), "{block}");
|
||||
}
|
||||
|
||||
|
||||
@@ -81,7 +81,7 @@ pub fn closing(prior: Option<&InstallRecord>, bundle: &Bundle, now: &InstallReco
|
||||
println!();
|
||||
ui::warn(&format!(
|
||||
"The protocol version changed: {} → {}.\n \
|
||||
Update the Protocol version field in Admin → Shard on your website. Nothing else \
|
||||
Update the Protocol version field in Admin → Shard (uo-link) on your website. Nothing else \
|
||||
changed —\n the URLs and the auth token are the same, and the sidecar answers a \
|
||||
website still set to\n {} with 409 rather than mis-parsing it.",
|
||||
previous_protocol.unwrap_or(bundle.protocol),
|
||||
|
||||
Reference in New Issue
Block a user