Compare commits
1 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
44b27eeffe |
@@ -1,96 +0,0 @@
|
||||
# Bezalel Tailscale Bootstrap
|
||||
|
||||
Refs #535
|
||||
|
||||
This is the repo-side operator packet for installing Tailscale on the Bezalel VPS and verifying the internal network path for federation work.
|
||||
|
||||
Important truth:
|
||||
- issue #535 names `104.131.15.18`
|
||||
- older Bezalel control-plane docs also mention `159.203.146.185`
|
||||
- the current source of truth in this repo is `ansible/inventory/hosts.ini`, which currently resolves `bezalel` to `67.205.155.108`
|
||||
|
||||
Because of that drift, `scripts/bezalel_tailscale_bootstrap.py` now resolves the target host from `ansible/inventory/hosts.ini` by default instead of trusting a stale hardcoded IP.
|
||||
|
||||
## What the script does
|
||||
|
||||
`python3 scripts/bezalel_tailscale_bootstrap.py`
|
||||
|
||||
Safe by default:
|
||||
- builds the remote bootstrap script
|
||||
- writes it locally to `/tmp/bezalel_tailscale_bootstrap.sh`
|
||||
- prints the SSH command needed to run it
|
||||
- does **not** touch the VPS unless `--apply` is passed
|
||||
|
||||
When applied, the remote script does all of the issue’s repo-side bootstrap steps:
|
||||
- installs Tailscale
|
||||
- runs `tailscale up --ssh --hostname bezalel`
|
||||
- appends the provided Mac SSH public key to `~/.ssh/authorized_keys`
|
||||
- prints `tailscale status --json`
|
||||
- pings the expected peer targets:
|
||||
- Mac: `100.124.176.28`
|
||||
- Ezra: `100.126.61.75`
|
||||
|
||||
## Required secrets / inputs
|
||||
|
||||
- Tailscale auth key
|
||||
- Mac SSH public key
|
||||
|
||||
Provide them either directly or through files:
|
||||
- `--auth-key` or `--auth-key-file`
|
||||
- `--ssh-public-key` or `--ssh-public-key-file`
|
||||
|
||||
## Dry-run example
|
||||
|
||||
```bash
|
||||
python3 scripts/bezalel_tailscale_bootstrap.py \
|
||||
--auth-key-file ~/.config/tailscale/auth_key \
|
||||
--ssh-public-key-file ~/.ssh/id_ed25519.pub \
|
||||
--json
|
||||
```
|
||||
|
||||
This prints:
|
||||
- resolved host
|
||||
- host source (`inventory:<path>` when pulled from `ansible/inventory/hosts.ini`)
|
||||
- local script path
|
||||
- SSH command to execute
|
||||
- peer targets
|
||||
|
||||
## Apply example
|
||||
|
||||
```bash
|
||||
python3 scripts/bezalel_tailscale_bootstrap.py \
|
||||
--auth-key-file ~/.config/tailscale/auth_key \
|
||||
--ssh-public-key-file ~/.ssh/id_ed25519.pub \
|
||||
--apply \
|
||||
--json
|
||||
```
|
||||
|
||||
## Verifying success after apply
|
||||
|
||||
The script now parses the remote stdout into structured verification data:
|
||||
- `verification.tailscale.self.tailscale_ips`
|
||||
- `verification.tailscale.self.dns_name`
|
||||
- `verification.peers`
|
||||
- `verification.ping_ok`
|
||||
|
||||
A successful run should show:
|
||||
- at least one Bezalel Tailscale IP under `tailscale_ips`
|
||||
- `ping_ok.mac = 100.124.176.28`
|
||||
- `ping_ok.ezra = 100.126.61.75`
|
||||
|
||||
## Expected remote install commands
|
||||
|
||||
```bash
|
||||
curl -fsSL https://tailscale.com/install.sh | sh
|
||||
tailscale up --ssh --hostname bezalel
|
||||
install -d -m 700 ~/.ssh
|
||||
touch ~/.ssh/authorized_keys && chmod 600 ~/.ssh/authorized_keys
|
||||
tailscale status --json
|
||||
```
|
||||
|
||||
## Why this PR does not claim live completion
|
||||
|
||||
This repo can safely ship the bootstrap script, host resolution logic, structured proof parsing, and operator packet.
|
||||
It cannot honestly claim that Bezalel was actually joined to the tailnet unless a human/operator runs the script with a real auth key and real SSH access to the VPS.
|
||||
|
||||
That means the correct PR language for #535 is advancement, not pretend closure.
|
||||
@@ -14,7 +14,6 @@ Quick-reference index for common operational tasks across the Timmy Foundation i
|
||||
| Agent scorecard | fleet-ops | `python3 scripts/agent_scorecard.py` |
|
||||
| View fleet manifest | fleet-ops | `cat manifest.yaml` |
|
||||
| Run nightly codebase genome pass | timmy-home | `python3 scripts/codebase_genome_nightly.py --dry-run` |
|
||||
| Prepare Bezalel Tailscale bootstrap | timmy-home | `python3 scripts/bezalel_tailscale_bootstrap.py --auth-key-file <path> --ssh-public-key-file <path> --json` |
|
||||
|
||||
## the-nexus (Frontend + Brain)
|
||||
|
||||
|
||||
@@ -16,14 +16,11 @@ import argparse
|
||||
import json
|
||||
import shlex
|
||||
import subprocess
|
||||
import re
|
||||
from json import JSONDecoder
|
||||
from pathlib import Path
|
||||
from typing import Any
|
||||
|
||||
DEFAULT_HOST = "67.205.155.108"
|
||||
DEFAULT_HOST = "159.203.146.185"
|
||||
DEFAULT_HOSTNAME = "bezalel"
|
||||
DEFAULT_INVENTORY_PATH = Path(__file__).resolve().parents[1] / "ansible" / "inventory" / "hosts.ini"
|
||||
DEFAULT_PEERS = {
|
||||
"mac": "100.124.176.28",
|
||||
"ezra": "100.126.61.75",
|
||||
@@ -69,37 +66,6 @@ def parse_tailscale_status(payload: dict[str, Any]) -> dict[str, Any]:
|
||||
}
|
||||
|
||||
|
||||
def resolve_host(host: str | None, inventory_path: Path = DEFAULT_INVENTORY_PATH, hostname: str = DEFAULT_HOSTNAME) -> tuple[str, str]:
|
||||
if host:
|
||||
return host, "explicit"
|
||||
if inventory_path.exists():
|
||||
pattern = re.compile(rf"^{re.escape(hostname)}\s+.*ansible_host=([^\s]+)")
|
||||
for line in inventory_path.read_text().splitlines():
|
||||
match = pattern.search(line.strip())
|
||||
if match:
|
||||
return match.group(1), f"inventory:{inventory_path}"
|
||||
return DEFAULT_HOST, "default"
|
||||
|
||||
|
||||
def parse_apply_output(stdout: str) -> dict[str, Any]:
|
||||
result: dict[str, Any] = {"tailscale": None, "ping_ok": {}}
|
||||
text = stdout or ""
|
||||
start = text.find("{")
|
||||
if start != -1:
|
||||
try:
|
||||
payload, _ = JSONDecoder().raw_decode(text[start:])
|
||||
if isinstance(payload, dict):
|
||||
result["tailscale"] = parse_tailscale_status(payload)
|
||||
except Exception:
|
||||
pass
|
||||
|
||||
for line in text.splitlines():
|
||||
if line.startswith("PING_OK:"):
|
||||
_, name, ip = line.split(":", 2)
|
||||
result["ping_ok"][name] = ip
|
||||
return result
|
||||
|
||||
|
||||
def build_ssh_command(host: str, remote_script_path: str = "/tmp/bezalel_tailscale_bootstrap.sh") -> list[str]:
|
||||
return ["ssh", host, f"bash {shlex.quote(remote_script_path)}"]
|
||||
|
||||
@@ -123,9 +89,8 @@ def parse_peer_args(items: list[str]) -> dict[str, str]:
|
||||
|
||||
def parse_args() -> argparse.Namespace:
|
||||
parser = argparse.ArgumentParser(description="Prepare or execute Tailscale bootstrap for the Bezalel VPS.")
|
||||
parser.add_argument("--host")
|
||||
parser.add_argument("--host", default=DEFAULT_HOST)
|
||||
parser.add_argument("--hostname", default=DEFAULT_HOSTNAME)
|
||||
parser.add_argument("--inventory-path", type=Path, default=DEFAULT_INVENTORY_PATH)
|
||||
parser.add_argument("--auth-key", help="Tailscale auth key")
|
||||
parser.add_argument("--auth-key-file", type=Path, help="Path to file containing the Tailscale auth key")
|
||||
parser.add_argument("--ssh-public-key", help="SSH public key to append to authorized_keys")
|
||||
@@ -151,7 +116,6 @@ def main() -> None:
|
||||
auth_key = _read_secret(args.auth_key, args.auth_key_file)
|
||||
ssh_public_key = _read_secret(args.ssh_public_key, args.ssh_public_key_file)
|
||||
peers = parse_peer_args(args.peer)
|
||||
resolved_host, host_source = resolve_host(args.host, args.inventory_path, args.hostname)
|
||||
|
||||
if not auth_key:
|
||||
raise SystemExit("Missing Tailscale auth key. Use --auth-key or --auth-key-file.")
|
||||
@@ -162,31 +126,28 @@ def main() -> None:
|
||||
write_script(args.script_out, script)
|
||||
|
||||
payload: dict[str, Any] = {
|
||||
"host": resolved_host,
|
||||
"host_source": host_source,
|
||||
"host": args.host,
|
||||
"hostname": args.hostname,
|
||||
"inventory_path": str(args.inventory_path),
|
||||
"script_out": str(args.script_out),
|
||||
"remote_script_path": args.remote_script_path,
|
||||
"ssh_command": build_ssh_command(resolved_host, args.remote_script_path),
|
||||
"ssh_command": build_ssh_command(args.host, args.remote_script_path),
|
||||
"peer_targets": peers,
|
||||
"applied": False,
|
||||
}
|
||||
|
||||
if args.apply:
|
||||
result = run_remote(resolved_host, args.remote_script_path)
|
||||
result = run_remote(args.host, args.remote_script_path)
|
||||
payload["applied"] = True
|
||||
payload["exit_code"] = result.returncode
|
||||
payload["stdout"] = result.stdout
|
||||
payload["stderr"] = result.stderr
|
||||
payload["verification"] = parse_apply_output(result.stdout)
|
||||
|
||||
if args.json:
|
||||
print(json.dumps(payload, indent=2))
|
||||
return
|
||||
|
||||
print("--- Bezalel Tailscale Bootstrap ---")
|
||||
print(f"Host: {resolved_host} ({host_source})")
|
||||
print(f"Host: {args.host}")
|
||||
print(f"Local script: {args.script_out}")
|
||||
print("SSH command: " + " ".join(payload["ssh_command"]))
|
||||
if args.apply:
|
||||
|
||||
65
specs/math-review-gate.md
Normal file
65
specs/math-review-gate.md
Normal file
@@ -0,0 +1,65 @@
|
||||
# MATH-006: Independent Math Review Gate
|
||||
*Prevents Timmy from publicly claiming mathematical novelty before human/formal verification.*
|
||||
|
||||
## Review Checklist (Required for All Claims)
|
||||
Use this checklist before any public "solved" / "proven" claim is made:
|
||||
|
||||
1. **Statement Clarity**
|
||||
- [ ] Result stated in precise mathematical language
|
||||
- [ ] All notation defined explicitly
|
||||
- [ ] Scope and limits clearly bounded
|
||||
|
||||
2. **Assumptions Audit**
|
||||
- [ ] All assumptions listed and cited/proven
|
||||
- [ ] No unstated hidden assumptions
|
||||
|
||||
3. **Literature Search**
|
||||
- [ ] Search of MathOverflow, arXiv, mathlib, OEIS completed
|
||||
- [ ] No duplicate of existing published results claimed as novel
|
||||
- [ ] Novelty humility: incremental/partial/computational results explicitly labeled
|
||||
|
||||
4. **Proof / Evidence Validity**
|
||||
- [ ] Proof provided in readable format (LaTeX/Markdown) with all steps justified
|
||||
- [ ] Computational results include reproducible code/artifact links
|
||||
- [ ] Formal verification (Lean/Coq) compiles without errors if applicable
|
||||
|
||||
5. **Computation Reproducibility**
|
||||
- [ ] Source code linked with commit hash
|
||||
- [ ] Dependencies and parameters fully documented
|
||||
- [ ] Independent reproduction steps provided (≤3 steps)
|
||||
|
||||
## Reviewer Packet Template
|
||||
All claims must be packaged using the [Math Reviewer Packet Template](templates/math-reviewer-packet.md) before submission to any review channel.
|
||||
|
||||
## Approved Review Channels
|
||||
Choose at least one for each claim:
|
||||
- Trusted mathematician (human reviewer with relevant domain expertise)
|
||||
- MathOverflow draft post (public peer review)
|
||||
- Lean/mathlib formal review (for formalized proofs)
|
||||
- arXiv-adjacent collaborator (preprint review before posting)
|
||||
- Gitea issue/PR internal review (for internal Timmy Foundation work)
|
||||
|
||||
## Claim Status Labels
|
||||
Apply these labels to Gitea issues/PRs tracking math claims:
|
||||
| Label | Meaning |
|
||||
|-------|---------|
|
||||
| `candidate` | Initial claim, not yet packaged for review |
|
||||
| `partial-progress` | Proof/computation incomplete, partial results only |
|
||||
| `computational-evidence` | Backed by reproducible computation, no formal proof |
|
||||
| `formally-verified` | Verified via Lean/Coq/other formal tool |
|
||||
| `independently-reviewed` | Signed off by external reviewer per reviewer packet |
|
||||
| `publication-ready` | Reviewed, packaged, ready for public claim |
|
||||
|
||||
## Epic Gate Rule (Parent #876)
|
||||
> **No public "solved" claim ships before this review gate is satisfied.**
|
||||
> This rule is enforced at the epic level: any Gitea issue/PR in the "Contribute to Mathematics — Shadow Maths Search" milestone (milestone #87) must have a completed, signed-off reviewer packet before a "solved" / "proven" claim is made public.
|
||||
|
||||
## Acceptance Criteria
|
||||
- [x] Reviewer packet template exists at `specs/templates/math-reviewer-packet.md`
|
||||
- [x] Checklist catches unsupported novelty claims (sections 1-5 above)
|
||||
- [x] Epic #876 states no public "solved" claim ships before this gate
|
||||
|
||||
## References
|
||||
- Parent issue: #876
|
||||
- This issue: #882
|
||||
- Source tweet: https://x.com/rockachopa/status/2048170592759652597
|
||||
60
specs/templates/math-reviewer-packet.md
Normal file
60
specs/templates/math-reviewer-packet.md
Normal file
@@ -0,0 +1,60 @@
|
||||
# Math Reviewer Packet Template
|
||||
*Use this template to package any claimed mathematical result for independent review before public "solved" claims are made.*
|
||||
|
||||
## 1. Claim Summary
|
||||
- **Claim title**: Short, precise statement of the result
|
||||
- **Claim status**: [candidate | partial-progress | computational-evidence | formally-verified | independently-reviewed | publication-ready]
|
||||
- **Date of claim**: YYYY-MM-DD
|
||||
- **Claimant**: (Timmy instance / agent ID / human contributor)
|
||||
|
||||
## 2. Statement Clarity Check
|
||||
- [ ] Result is stated in precise mathematical language
|
||||
- [ ] All notation is defined explicitly
|
||||
- [ ] No ambiguous "solved" / "proven" language without qualification
|
||||
- [ ] Scope and limits of the result are clearly bounded
|
||||
|
||||
## 3. Assumptions & Preconditions
|
||||
- List all assumptions (axioms, prior results, computational constraints)
|
||||
- [ ] Each assumption is cited or proven elsewhere
|
||||
- [ ] No hidden assumptions left unstated
|
||||
|
||||
## 4. Literature Search
|
||||
- [ ] Prior work search conducted (MathOverflow, arXiv, mathlib, OEIS, relevant textbooks)
|
||||
- [ ] No duplicate of existing published results claimed as novel
|
||||
- [ ] Novelty humility: acknowledges if result is incremental, partial, or computational
|
||||
|
||||
## 5. Proof / Evidence Validity
|
||||
### For Proof-Based Results
|
||||
- [ ] Full proof provided in machine-readable format (LaTeX / Markdown)
|
||||
- [ ] Each step is logically justified
|
||||
- [ ] No gaps longer than 2 sentences without explicit citation or lemma
|
||||
|
||||
### For Computational Results
|
||||
- [ ] Code/artifact link provided (reproducible environment)
|
||||
- [ ] Random seeds / parameters fully documented
|
||||
- [ ] Output verified by independent script (if applicable)
|
||||
|
||||
### For Formal Verification
|
||||
- [ ] Lean / Coq / other formal proof assistant file linked
|
||||
- [ ] Compiles without errors on standard toolchain
|
||||
|
||||
## 6. Reproducibility Package
|
||||
- [ ] All source code used is linked (repo commit hash / Gitea issue/PR reference)
|
||||
- [ ] Dependencies listed with versions
|
||||
- [ ] Minimal reproduction steps provided (3 steps or fewer)
|
||||
|
||||
## 7. Review Channel & Sign-off
|
||||
- **Selected review channel**: (trusted mathematician / MathOverflow draft / Lean/mathlib review / arXiv-adjacent collaborator / other)
|
||||
- **Reviewer identity**: (handle / name / affiliation)
|
||||
- **Review date**: YYYY-MM-DD
|
||||
- **Review outcome**: [APPROVED | REVISION REQUIRED | REJECTED]
|
||||
- **Reviewer notes**: (free text)
|
||||
|
||||
## 8. Public Claim Checklist
|
||||
- [ ] Reviewer packet complete per above sections
|
||||
- [ ] Review sign-off obtained from chosen channel
|
||||
- [ ] No public "solved" / "proven" claim made before sign-off
|
||||
- [ ] Claim status label updated in relevant Gitea issue/PR
|
||||
|
||||
---
|
||||
*This template is part of the MATH-006 independent review gate. No public novelty claim ships without a completed, signed-off packet.*
|
||||
@@ -2,12 +2,9 @@ from scripts.bezalel_tailscale_bootstrap import (
|
||||
DEFAULT_PEERS,
|
||||
build_remote_script,
|
||||
build_ssh_command,
|
||||
parse_apply_output,
|
||||
parse_peer_args,
|
||||
parse_tailscale_status,
|
||||
resolve_host,
|
||||
)
|
||||
from pathlib import Path
|
||||
|
||||
|
||||
def test_build_remote_script_contains_install_up_and_key_append():
|
||||
@@ -81,46 +78,3 @@ def test_parse_peer_args_merges_overrides_into_defaults():
|
||||
"ezra": "100.126.61.76",
|
||||
"forge": "100.70.0.9",
|
||||
}
|
||||
|
||||
|
||||
def test_resolve_host_prefers_inventory_over_stale_default(tmp_path: Path):
|
||||
inventory = tmp_path / "hosts.ini"
|
||||
inventory.write_text(
|
||||
"[fleet]\n"
|
||||
"ezra ansible_host=143.198.27.163 ansible_user=root\n"
|
||||
"bezalel ansible_host=67.205.155.108 ansible_user=root\n"
|
||||
)
|
||||
|
||||
host, source = resolve_host(None, inventory)
|
||||
|
||||
assert host == "67.205.155.108"
|
||||
assert source == f"inventory:{inventory}"
|
||||
|
||||
|
||||
def test_parse_apply_output_extracts_status_and_ping_markers():
|
||||
stdout = (
|
||||
'{"Self": {"HostName": "bezalel", "DNSName": "bezalel.tailnet.ts.net", "TailscaleIPs": ["100.90.0.10"]}, '
|
||||
'"Peer": {"node-1": {"HostName": "ezra", "TailscaleIPs": ["100.126.61.75"]}}}'
|
||||
"\nPING_OK:mac:100.124.176.28\n"
|
||||
"PING_OK:ezra:100.126.61.75\n"
|
||||
)
|
||||
|
||||
result = parse_apply_output(stdout)
|
||||
|
||||
assert result["tailscale"]["self"]["tailscale_ips"] == ["100.90.0.10"]
|
||||
assert result["ping_ok"] == {"mac": "100.124.176.28", "ezra": "100.126.61.75"}
|
||||
|
||||
|
||||
def test_runbook_doc_exists_and_mentions_inventory_auth_and_peer_checks():
|
||||
doc = Path("docs/BEZALEL_TAILSCALE_BOOTSTRAP.md")
|
||||
assert doc.exists(), "missing docs/BEZALEL_TAILSCALE_BOOTSTRAP.md"
|
||||
text = doc.read_text()
|
||||
assert "ansible/inventory/hosts.ini" in text
|
||||
assert "tailscale up" in text
|
||||
assert "authorized_keys" in text
|
||||
assert "100.124.176.28" in text
|
||||
assert "100.126.61.75" in text
|
||||
|
||||
runbook = Path("docs/RUNBOOK_INDEX.md").read_text()
|
||||
assert "Prepare Bezalel Tailscale bootstrap" in runbook
|
||||
assert "scripts/bezalel_tailscale_bootstrap.py" in runbook
|
||||
|
||||
Reference in New Issue
Block a user