Compare commits
1 Commits
fix/535
...
fix/528-v2
| Author | SHA1 | Date | |
|---|---|---|---|
|
b5f56e35ad |
@@ -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.
|
||||
281
docs/LAB-003-battery-disconnect-install.md
Normal file
281
docs/LAB-003-battery-disconnect-install.md
Normal file
@@ -0,0 +1,281 @@
|
||||
# LAB-003: Truck Battery Disconnect Switch Installation
|
||||
|
||||
**Issue:** [timmy-home#528](https://forge.alexanderwhitestone.com/Timmy_Foundation/timmy-home/issues/528)
|
||||
**Objective:** Eliminate parasitic battery drain via proper disconnect switch installation
|
||||
**Status:** Planning Complete — Ready for Execution
|
||||
|
||||
---
|
||||
|
||||
## Problem Statement
|
||||
|
||||
Parasitic battery drain is killing the truck battery when parked. This is critical for operational mobility in a rural location where the truck is essential for:
|
||||
- Supply runs to Newport/Claremont
|
||||
- Emergency egress
|
||||
- Equipment transport
|
||||
|
||||
The battery has likely been damaged from repeated deep discharges and may need replacement.
|
||||
|
||||
---
|
||||
|
||||
## Pre-Installation Checklist
|
||||
|
||||
### Diagnostic Steps (Do These First)
|
||||
|
||||
1. **Verify parasitic drain with multimeter:**
|
||||
- Set multimeter to DC Amps (10A scale)
|
||||
- Disconnect negative battery terminal
|
||||
- Connect multimeter in series between battery negative and cable
|
||||
- Normal drain: <50mA (0.05A)
|
||||
- Problem drain: >100mA (0.1A)
|
||||
- Record reading: __________ mA
|
||||
|
||||
2. **Identify the culprit (if drain is high):**
|
||||
- While monitoring current, pull fuses one at a time
|
||||
- When current drops, you've found the circuit
|
||||
- Common culprits: aftermarket radio, alarm system, interior lights, OBD-II tracker
|
||||
|
||||
3. **Test battery health:**
|
||||
- With engine off, battery voltage should be ~12.6V
|
||||
- With engine running, alternator should show ~13.7-14.7V
|
||||
- If voltage <12.4V when "fully charged," battery is degraded
|
||||
|
||||
---
|
||||
|
||||
## Shopping List
|
||||
|
||||
### Required Items
|
||||
|
||||
| Item | Purpose | Est. Cost | Stores |
|
||||
|------|---------|-----------|--------|
|
||||
| Battery disconnect switch (side-post or top-post) | Isolate battery when parked | $8-15 | AutoZone, Advance, O'Reilly, NAPA |
|
||||
| Terminal shim/post riser (if needed) | Ensure proper terminal clearance | $3-8 | Same as above |
|
||||
| Dielectric grease | Prevent corrosion on terminals | $3-5 | Same as above |
|
||||
| Battery terminal cleaner brush | Clean posts before install | $2-4 | Same as above |
|
||||
| **Total Estimated** | | **$15-30** | |
|
||||
|
||||
### Product Recommendations
|
||||
|
||||
#### Option 1: Top Terminal Post Mount (Most Common)
|
||||
- **Recommended:** Battery Doctor Knife Switch #20138 (Advance Auto)
|
||||
- $12-15
|
||||
- 250A continuous, 1000A surge
|
||||
- Easy quarter-turn operation
|
||||
- No tools needed to operate
|
||||
|
||||
- **Alternative:** EverStart Battery Disconnect Switch (Walmart/AutoZone)
|
||||
- $8-12
|
||||
- 125A continuous
|
||||
- Twist-knob style
|
||||
|
||||
#### Option 2: Side Terminal Mount (GM Vehicles)
|
||||
- **Recommended:** Battery Doctor Side Terminal Switch #20140
|
||||
- $12-18
|
||||
- Designed for GM-style side terminals
|
||||
- Requires terminal shim for proper fit
|
||||
|
||||
#### Option 3: Quick-Disconnect (Side Post with Cable)
|
||||
- **Recommended:** Quick Cable Battery Disconnect #5091
|
||||
- $10-15
|
||||
- Works with existing cable ends
|
||||
- Marine-grade (good for NH weather)
|
||||
|
||||
### Store Locations (Newport/Claremont Area)
|
||||
|
||||
**AutoZone — Newport**
|
||||
- 65 Main St, Newport, NH 03773
|
||||
- (603) 863-5040
|
||||
- Hours: M-Sat 7:30AM-9PM, Sun 9AM-8PM
|
||||
|
||||
**Advance Auto Parts — Newport**
|
||||
- 71 Main St, Newport, NH 03773
|
||||
- (603) 863-2860
|
||||
- Hours: M-Sat 7:30AM-9PM, Sun 9AM-7PM
|
||||
|
||||
**O'Reilly Auto Parts — Claremont**
|
||||
- 385 Washington St, Claremont, NH 03743
|
||||
- (603) 542-4635
|
||||
- Hours: M-Sat 7:30AM-9PM, Sun 9AM-8PM
|
||||
|
||||
**NAPA Auto Parts — Newport**
|
||||
- 29 John Stark Hwy, Newport, NH 03773
|
||||
- (603) 863-5500
|
||||
- Hours: M-F 7:30AM-6PM, Sat 7:30AM-4PM, Sun Closed
|
||||
|
||||
---
|
||||
|
||||
## Installation Procedure
|
||||
|
||||
### Tools Required
|
||||
- 10mm wrench (for most battery terminals)
|
||||
- 13mm wrench (if GM side terminals)
|
||||
- Wire brush or terminal cleaner
|
||||
- Shop rags
|
||||
- Optional: zip ties for cable management
|
||||
|
||||
### Step-by-Step Installation
|
||||
|
||||
1. **Safety First**
|
||||
- Park on level ground
|
||||
- Engage parking brake
|
||||
- Remove keys from ignition
|
||||
- Wear safety glasses
|
||||
|
||||
2. **Disconnect Battery**
|
||||
- **CRITICAL:** Disconnect NEGATIVE (-) terminal FIRST
|
||||
- This prevents short circuits if wrench touches frame
|
||||
- Loosen 10mm nut, wiggle terminal off post
|
||||
- Tuck cable away so it can't touch battery post
|
||||
|
||||
3. **Clean Terminals**
|
||||
- Use terminal brush to clean inside of cable clamp
|
||||
- Clean battery post until shiny
|
||||
- Apply thin layer of dielectric grease to post
|
||||
|
||||
4. **Install Disconnect Switch**
|
||||
|
||||
**For Top Post Batteries:**
|
||||
- Remove battery cable end from switch (if pre-attached)
|
||||
- Slide switch onto battery negative post
|
||||
- Re-attach cable to other side of switch
|
||||
- Tighten securely (don't overtighten — battery posts strip easily)
|
||||
|
||||
**For Side Terminal (GM) Batteries:**
|
||||
- May need terminal shim/post riser for clearance
|
||||
- Install shim on negative side terminal
|
||||
- Mount switch to shim
|
||||
- Connect cable to switch
|
||||
|
||||
**For Cable-End Style:**
|
||||
- Cut existing negative cable near battery (leave enough slack)
|
||||
- Strip 1/2" of insulation from both ends
|
||||
- Install in quick-disconnect connector
|
||||
- Crimp or bolt securely per manufacturer instructions
|
||||
|
||||
5. **Test Installation**
|
||||
- Switch should rotate/turn smoothly
|
||||
- No binding or interference with battery hold-down
|
||||
- Cable has enough slack for switch operation
|
||||
- Switch in "ON" position: truck electronics work
|
||||
- Switch in "OFF" position: no power to truck
|
||||
|
||||
6. **Reconnect and Verify**
|
||||
- Switch to ON position
|
||||
- Attempt to start truck — should start normally
|
||||
- Check all electronics function
|
||||
- Switch to OFF position
|
||||
- Verify no interior lights, radio, etc.
|
||||
|
||||
---
|
||||
|
||||
## Testing Protocol
|
||||
|
||||
### Immediate Test (Same Day)
|
||||
- [ ] Start truck with switch ON — engine starts normally
|
||||
- [ ] Turn switch OFF while running — engine dies (expected)
|
||||
- [ ] Switch OFF, wait 30 seconds, attempt start — no response (expected)
|
||||
- [ ] Switch ON, attempt start — starts normally
|
||||
|
||||
### Overnight Test (Critical)
|
||||
- [ ] Park truck with switch in OFF position
|
||||
- [ ] Note battery voltage: __________ V
|
||||
- [ ] Wait 24 hours
|
||||
- [ ] Next day, switch ON, attempt start
|
||||
- [ ] Record result: □ Started normally □ Slow crank □ No start
|
||||
- [ ] If started, check voltage: __________ V
|
||||
|
||||
### 48-Hour Test (If Battery Healthy)
|
||||
- [ ] Repeat overnight test with 48-hour duration
|
||||
- [ ] If truck starts normally, installation is successful
|
||||
- [ ] If truck fails to start, battery replacement needed
|
||||
|
||||
---
|
||||
|
||||
## If Battery Needs Replacement
|
||||
|
||||
### Symptoms of Bad Battery
|
||||
- Voltage <12.4V after "charging" overnight
|
||||
- Slow cranking even with switch disconnected
|
||||
- Battery case bulging or terminals corroded
|
||||
- Battery >4 years old
|
||||
|
||||
### Replacement Battery Shopping
|
||||
|
||||
**Common Truck Batteries (Group Size):**
|
||||
- Measure existing battery or check current battery label
|
||||
- Common truck sizes: Group 24F, 27F, 31, 65, 78
|
||||
|
||||
**Recommended:**
|
||||
- **DieHard Platinum AGM** (Advance Auto) — $200-250
|
||||
- Best cold cranking amps (CCA) for NH winters
|
||||
- AGM handles deep discharges better
|
||||
- 3-year full replacement warranty
|
||||
|
||||
- **EverStart Maxx** (Walmart) — $100-150
|
||||
- Budget option
|
||||
- Check CCA rating matches or exceeds old battery
|
||||
|
||||
- **Optima YellowTop** (Pep Boys/Amazon) — $300+
|
||||
- Deep cycle + starting
|
||||
- Best for vehicles with parasitic drain issues
|
||||
- Handles repeated discharge cycles
|
||||
|
||||
---
|
||||
|
||||
## Documentation Requirements
|
||||
|
||||
Per issue #528 acceptance criteria, upload to Gitea:
|
||||
|
||||
- [ ] Photo of installed disconnect switch (close-up)
|
||||
- [ ] Photo of receipt from parts store
|
||||
- [ ] Photo of truck odometer (optional, for record)
|
||||
- [ ] Note of test results (overnight start success/failure)
|
||||
- [ ] Note of battery voltage readings (before/after)
|
||||
|
||||
Upload via:
|
||||
1. Open issue #528 in browser
|
||||
2. Comment with photos attached
|
||||
3. Check off acceptance criteria
|
||||
|
||||
---
|
||||
|
||||
## Troubleshooting
|
||||
|
||||
| Problem | Cause | Solution |
|
||||
|---------|-------|----------|
|
||||
| Switch won't tighten on post | Wrong terminal type | Get side-terminal adapter or different switch style |
|
||||
| Switch hits battery hold-down | Clearance issue | Add terminal shim to raise switch, or relocate hold-down |
|
||||
| Cable too short | Switch adds height | Get battery cable extension or longer replacement cable |
|
||||
| Still drains with switch OFF | Switch installed on wrong terminal | Move to NEGATIVE terminal only |
|
||||
| Switch gets hot | Loose connection | Tighten terminal nuts; check for corrosion |
|
||||
| Truck won't start even with switch ON | Battery too dead | Jump start, then evaluate if battery needs replacement |
|
||||
|
||||
---
|
||||
|
||||
## Cold Weather Considerations (NH)
|
||||
|
||||
- Batteries lose ~50% capacity at 0°F
|
||||
- Disconnect switch prevents drain but doesn't prevent cold damage
|
||||
- If storing truck long-term:
|
||||
- Switch to OFF
|
||||
- Consider battery maintainer (trickle charger)
|
||||
- Or remove battery and store in heated space
|
||||
|
||||
---
|
||||
|
||||
## Summary
|
||||
|
||||
This installation is straightforward and should take 30-60 minutes including store run. The key steps:
|
||||
|
||||
1. **Diagnose first** — verify parasitic drain, check battery health
|
||||
2. **Buy the right switch** — match your battery terminal type (top vs side)
|
||||
3. **Install on NEGATIVE terminal only** — this is critical for safety
|
||||
4. **Test thoroughly** — overnight test proves the fix worked
|
||||
5. **Document** — photos and receipts to close the issue
|
||||
|
||||
**Estimated total time:** 2-3 hours (including store run)
|
||||
**Estimated cost:** $15-30 (switch only) or $100-300 (if battery replacement needed)
|
||||
|
||||
---
|
||||
|
||||
*Prepared for: timmy-home#528*
|
||||
*Last updated: 2026-04-22*
|
||||
109
docs/LAB-003-verification-template.md
Normal file
109
docs/LAB-003-verification-template.md
Normal file
@@ -0,0 +1,109 @@
|
||||
# LAB-003 Verification Report Template
|
||||
|
||||
**Issue:** [timmy-home#528](https://forge.alexanderwhitestone.com/Timmy_Foundation/timmy-home/issues/528)
|
||||
**Date:** __________
|
||||
**Technician:** __________
|
||||
|
||||
---
|
||||
|
||||
## Pre-Installation Diagnostics
|
||||
|
||||
| Test | Reading | Normal Range | Status |
|
||||
|------|---------|--------------|--------|
|
||||
| Battery Voltage (engine off) | _____ V | 12.4-12.7V | □ Pass □ Fail |
|
||||
| Parasitic Current | _____ mA | <50mA | □ Pass □ Fail |
|
||||
| Battery Voltage (engine running) | _____ V | 13.7-14.7V | □ Pass □ Fail |
|
||||
|
||||
**Battery Health Assessment:** □ Good □ Fair □ Replace
|
||||
|
||||
---
|
||||
|
||||
## Parts Purchased
|
||||
|
||||
| Item | Store | Cost |
|
||||
|------|-------|------|
|
||||
| Battery Disconnect Switch | _________ | $_____ |
|
||||
| Dielectric Grease | _________ | $_____ |
|
||||
| Terminal Cleaner | _________ | $_____ |
|
||||
| Other: _________ | _________ | $_____ |
|
||||
| **Total** | | **$_____** |
|
||||
|
||||
---
|
||||
|
||||
## Installation Checklist
|
||||
|
||||
- [ ] Negative terminal disconnected first
|
||||
- [ ] Terminals cleaned
|
||||
- [ ] Dielectric grease applied
|
||||
- [ ] Switch installed on NEGATIVE terminal
|
||||
- [ ] All connections tight
|
||||
- [ ] Switch operates smoothly (no tools needed)
|
||||
- [ ] No interference with hood/battery hold-down
|
||||
|
||||
---
|
||||
|
||||
## Post-Installation Tests
|
||||
|
||||
### Immediate Tests
|
||||
- [ ] Truck starts with switch ON
|
||||
- [ ] No power with switch OFF
|
||||
- [ ] All electronics function normally (switch ON)
|
||||
|
||||
### 24-Hour Test
|
||||
- [ ] Parked with switch OFF for 24+ hours
|
||||
- [ ] Truck started normally next day
|
||||
- [ ] Battery voltage before test: _____ V
|
||||
- [ ] Battery voltage after test: _____ V
|
||||
|
||||
### 48-Hour Test (if applicable)
|
||||
- [ ] Parked with switch OFF for 48+ hours
|
||||
- [ ] Truck started normally
|
||||
|
||||
---
|
||||
|
||||
## Photos Required
|
||||
|
||||
Upload these to issue #528:
|
||||
|
||||
- [ ] Photo of installed disconnect switch (close-up)
|
||||
- [ ] Photo of receipt from parts store
|
||||
- [ ] Photo showing switch in OFF position
|
||||
- [ ] Photo of truck dashboard (optional, for records)
|
||||
|
||||
---
|
||||
|
||||
## Results Summary
|
||||
|
||||
| Acceptance Criterion | Status |
|
||||
|---------------------|--------|
|
||||
| Disconnect switch installed and physically secure | □ Pass □ Fail |
|
||||
| Truck starts reliably after 24+ hours with switch disconnected | □ Pass □ Fail |
|
||||
| No special tools required to operate the disconnect | □ Pass □ Fail |
|
||||
| Receipt uploaded to issue | □ Pass □ Fail |
|
||||
|
||||
**Overall Status:** □ Complete - All criteria met
|
||||
□ Partial - See notes
|
||||
□ Failed - Requires follow-up
|
||||
|
||||
---
|
||||
|
||||
## Notes / Issues Encountered
|
||||
|
||||
_________________________________________________________________
|
||||
|
||||
_________________________________________________________________
|
||||
|
||||
_________________________________________________________________
|
||||
|
||||
---
|
||||
|
||||
## Follow-up Actions (if needed)
|
||||
|
||||
- [ ] Replace battery (if tests failed)
|
||||
- [ ] Exchange switch for different style (if fitment issue)
|
||||
- [ ] Troubleshoot remaining parasitic drain
|
||||
- [ ] Other: _____________________________________________
|
||||
|
||||
---
|
||||
|
||||
*Fill out this template during installation and upload to issue #528*
|
||||
@@ -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:
|
||||
|
||||
215
scripts/lab_003_battery_disconnect.sh
Executable file
215
scripts/lab_003_battery_disconnect.sh
Executable file
@@ -0,0 +1,215 @@
|
||||
#!/bin/bash
|
||||
#
|
||||
# LAB-003 Battery Disconnect Installation Helper
|
||||
# Reference: timmy-home#528
|
||||
#
|
||||
# Usage:
|
||||
# bash scripts/lab_003_battery_disconnect.sh diagnose # Test battery before install
|
||||
# bash scripts/lab_003_battery_disconnect.sh checklist # Print installation checklist
|
||||
# bash scripts/lab_003_battery_disconnect.sh verify # Post-install verification
|
||||
#
|
||||
|
||||
set -euo pipefail
|
||||
|
||||
SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
|
||||
LOG_FILE="$SCRIPT_DIR/../logs/lab_003_$(date +%Y%m%d_%H%M%S).log"
|
||||
ISSUE_URL="https://forge.alexanderwhitestone.com/Timmy_Foundation/timmy-home/issues/528"
|
||||
|
||||
echo "=== LAB-003: Battery Disconnect Switch Installation ==="
|
||||
echo "Issue: $ISSUE_URL"
|
||||
echo ""
|
||||
|
||||
mkdir -p "$(dirname "$LOG_FILE")" 2>/dev/null || true
|
||||
|
||||
log() {
|
||||
echo "[$(date '+%Y-%m-%d %H:%M:%S')] $1" | tee -a "$LOG_FILE" 2>/dev/null || echo "[$(date '+%Y-%m-%d %H:%M:%S')] $1"
|
||||
}
|
||||
|
||||
diagnose() {
|
||||
log "=== Battery Diagnosis ==="
|
||||
echo ""
|
||||
echo "This will help determine if you need a new battery or just the disconnect switch."
|
||||
echo ""
|
||||
|
||||
echo "Step 1: Check battery voltage with multimeter"
|
||||
echo " - Set multimeter to DC Volts (20V scale)"
|
||||
echo " - Red probe to battery positive (+)"
|
||||
echo " - Black probe to battery negative (-)"
|
||||
echo ""
|
||||
read -p "Enter voltage reading (e.g., 12.6): " voltage
|
||||
log "Battery voltage: ${voltage}V"
|
||||
|
||||
if (( $(echo "$voltage >= 12.6" | bc -l) )); then
|
||||
echo "✓ Battery voltage is GOOD (≥12.6V)"
|
||||
log "Battery voltage GOOD"
|
||||
elif (( $(echo "$voltage >= 12.4" | bc -l) )); then
|
||||
echo "⚠ Battery voltage is FAIR (12.4-12.5V) - may need replacement soon"
|
||||
log "Battery voltage FAIR"
|
||||
else
|
||||
echo "✗ Battery voltage is LOW (<12.4V) - likely needs replacement"
|
||||
log "Battery voltage LOW - replacement recommended"
|
||||
fi
|
||||
|
||||
echo ""
|
||||
echo "Step 2: Check for parasitic drain"
|
||||
echo " - Set multimeter to DC Amps (10A scale)"
|
||||
echo " - Disconnect negative battery cable"
|
||||
echo " - Connect multimeter between battery negative post and cable"
|
||||
echo " - Wait 2 minutes for modules to sleep"
|
||||
echo ""
|
||||
read -p "Enter current reading in milliamps (e.g., 50): " current
|
||||
log "Parasitic current: ${current}mA"
|
||||
|
||||
if (( $(echo "$current <= 50" | bc -l) )); then
|
||||
echo "✓ Parasitic drain is NORMAL (≤50mA)"
|
||||
log "Parasitic drain NORMAL"
|
||||
echo ""
|
||||
echo "NOTE: Normal drain means the disconnect switch may not be necessary"
|
||||
echo " unless you're storing the truck for weeks at a time."
|
||||
elif (( $(echo "$current <= 100" | bc -l) )); then
|
||||
echo "⚠ Parasitic drain is ELEVATED (50-100mA)"
|
||||
log "Parasitic drain ELEVATED"
|
||||
echo "Disconnect switch will help prevent dead battery."
|
||||
else
|
||||
echo "✗ Parasitic drain is HIGH (>100mA)"
|
||||
log "Parasitic drain HIGH - disconnect switch highly recommended"
|
||||
echo ""
|
||||
echo "You definitely need the disconnect switch!"
|
||||
fi
|
||||
|
||||
echo ""
|
||||
log "Diagnosis complete. Log saved to: $LOG_FILE"
|
||||
}
|
||||
|
||||
checklist() {
|
||||
cat << 'EOF'
|
||||
=== LAB-003 Installation Checklist ===
|
||||
|
||||
BEFORE YOU GO:
|
||||
□ Determine battery terminal type (top post vs side terminal)
|
||||
□ Measure battery group size (look for label like "Group 24F")
|
||||
□ Check if you have 10mm and 13mm wrenches
|
||||
□ Verify multimeter has DC Volts and DC Amps capability
|
||||
|
||||
AT THE STORE:
|
||||
□ Purchase battery disconnect switch (match your terminal type)
|
||||
□ Purchase dielectric grease
|
||||
□ Purchase terminal cleaner brush (if you don't have one)
|
||||
□ Get receipt for documentation
|
||||
|
||||
INSTALLATION:
|
||||
□ Park on level ground, engage parking brake
|
||||
□ Disconnect NEGATIVE (-) terminal first
|
||||
□ Clean terminals with wire brush
|
||||
□ Apply dielectric grease
|
||||
□ Install switch on NEGATIVE terminal
|
||||
□ Reconnect and test operation
|
||||
|
||||
TESTING:
|
||||
□ Switch ON: truck starts normally
|
||||
□ Switch OFF: no power to truck
|
||||
□ Overnight test: switch OFF, verify start next day
|
||||
□ Document with photos
|
||||
□ Upload photos to issue #528
|
||||
|
||||
TROUBLESHOOTING:
|
||||
□ If switch doesn't fit: wrong terminal type - exchange at store
|
||||
□ If still drains overnight: battery needs replacement
|
||||
□ If slow crank with new switch: battery degraded - replace
|
||||
|
||||
EOF
|
||||
}
|
||||
|
||||
verify() {
|
||||
log "=== Post-Installation Verification ==="
|
||||
echo ""
|
||||
echo "Post-installation tests. Run these AFTER installing the disconnect switch."
|
||||
echo ""
|
||||
|
||||
read -p "Test 1 - Can you start the truck with the switch ON? (y/n): " t1
|
||||
if [[ "$t1" == "y" ]]; then
|
||||
log "Test 1 PASSED: Truck starts with switch ON"
|
||||
echo "✓ Test 1 PASSED"
|
||||
else
|
||||
log "Test 1 FAILED: Truck won't start with switch ON"
|
||||
echo "✗ Test 1 FAILED - Check installation and battery"
|
||||
fi
|
||||
|
||||
echo ""
|
||||
read -p "Test 2 - With truck OFF and switch OFF, do interior lights/radio work? (y/n): " t2
|
||||
if [[ "$t2" == "n" ]]; then
|
||||
log "Test 2 PASSED: No power with switch OFF"
|
||||
echo "✓ Test 2 PASSED"
|
||||
else
|
||||
log "Test 2 FAILED: Power still on with switch OFF"
|
||||
echo "✗ Test 2 FAILED - Switch may be on wrong terminal or defective"
|
||||
fi
|
||||
|
||||
echo ""
|
||||
read -p "Test 3 - Is the switch easy to operate by hand (no tools needed)? (y/n): " t3
|
||||
if [[ "$t3" == "y" ]]; then
|
||||
log "Test 3 PASSED: Switch operable without tools"
|
||||
echo "✓ Test 3 PASSED"
|
||||
else
|
||||
log "Test 3 WARNING: Switch may require tools"
|
||||
echo "⚠ Test 3 WARNING - Consider a different switch style"
|
||||
fi
|
||||
|
||||
echo ""
|
||||
echo "=== 24-Hour Test ==="
|
||||
echo "Park truck with switch OFF. Tomorrow, try to start it."
|
||||
echo "Record result in issue #528: $ISSUE_URL"
|
||||
echo ""
|
||||
|
||||
read -p "Did the 24-hour test pass (truck started normally)? (y/n/skip): " t24
|
||||
case "$t24" in
|
||||
y)
|
||||
log "24-hour test PASSED"
|
||||
echo "✓ Installation SUCCESSFUL!"
|
||||
echo ""
|
||||
echo "Close issue #528 with:"
|
||||
echo " - Photo of installed switch"
|
||||
echo " - Photo of receipt"
|
||||
echo " - Note: '24-hour test passed, truck started normally'"
|
||||
;;
|
||||
n)
|
||||
log "24-hour test FAILED"
|
||||
echo "✗ Test FAILED - Battery likely needs replacement"
|
||||
echo ""
|
||||
echo "Next steps:"
|
||||
echo " 1. Jump start truck"
|
||||
echo " 2. Drive to store for battery replacement"
|
||||
echo " 3. Reference LAB-003-battery-disconnect-install.md for battery shopping guide"
|
||||
;;
|
||||
*)
|
||||
log "24-hour test pending"
|
||||
echo "Run this script again after 24 hours with: bash $0 verify"
|
||||
;;
|
||||
esac
|
||||
|
||||
echo ""
|
||||
log "Verification complete. Log saved to: $LOG_FILE"
|
||||
}
|
||||
|
||||
case "${1:-help}" in
|
||||
diagnose)
|
||||
diagnose
|
||||
;;
|
||||
checklist)
|
||||
checklist
|
||||
;;
|
||||
verify)
|
||||
verify
|
||||
;;
|
||||
*)
|
||||
echo "Usage: $0 {diagnose|checklist|verify}"
|
||||
echo ""
|
||||
echo " diagnose - Check battery voltage and parasitic drain"
|
||||
echo " checklist - Print installation checklist"
|
||||
echo " verify - Post-installation verification tests"
|
||||
echo ""
|
||||
echo "Full guide: docs/LAB-003-battery-disconnect-install.md"
|
||||
echo "Issue: $ISSUE_URL"
|
||||
exit 1
|
||||
;;
|
||||
esac
|
||||
@@ -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