michal/lab
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

refactor: rename CLI binary from lab to labctl

Browse Source 
Updated everywhere: constants, package.json bin, completions,
nfpm packaging, build scripts, CI, banner text. Binary is now
/usr/bin/labctl. Internal package names (@lab/*) unchanged.

Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
This commit is contained in:
Michal
2026-03-18 00:07:17 +00:00
parent e3a1460593
commit 897844fae0
14 changed files with 140 additions and 140 deletions
Download Patch File Download Diff File Expand all files Collapse all files

91
bastion/completions/lab.fish
View File

@@ -1,91 +0,0 @@
# lab fish completions -- auto-generated by scripts/generate-completions.ts
# DO NOT EDIT MANUALLY -- run: pnpm completions:generate
complete -c lab -e
complete -c lab -f
# Global options
complete -c lab -s v -l version -d 'Show version'
complete -c lab -s h -l help -d 'Show help'
# Helper: test if a subcommand chain is active
function __lab_using_cmd
set -l tokens (commandline -opc)
set -l expected $argv
set -l depth (count $expected)
set -l found 0
set -l i 1
for tok in $tokens[2..]
if string match -q -- "-*" $tok
continue
end
set i (math $i + 1)
set -l idx (math $i - 1)
if test $idx -le $depth
if test "$tok" != "$expected[$idx]"
return 1
end
set found (math $found + 1)
else
return 1
end
end
test $found -eq $depth
end
# Top-level commands
complete -c lab -n "not __fish_seen_subcommand_from init provision" -a init -d 'Initialise infrastructure components'
complete -c lab -n "not __fish_seen_subcommand_from init provision" -a provision -d 'Machine provisioning operations'
# init subcommands
complete -c lab -n "__lab_using_cmd init" -a bastion -d 'Bastion PXE server management'
# init bastion subcommands
complete -c lab -n "__lab_using_cmd init bastion" -a standalone -d 'Standalone bastion server lifecycle'
# init bastion standalone subcommands
complete -c lab -n "__lab_using_cmd init bastion standalone" -a start -d 'Start the bastion server (HTTP + dnsmasq PXE)'
complete -c lab -n "__lab_using_cmd init bastion standalone" -a stop -d 'Stop a running bastion server'
complete -c lab -n "__lab_using_cmd init bastion standalone" -a status -d 'Show bastion server status'
# init bastion standalone start options
complete -c lab -n "__lab_using_cmd init bastion standalone start" -l port -d 'HTTP port' -x
complete -c lab -n "__lab_using_cmd init bastion standalone start" -l dir -d 'Bastion data directory' -x
complete -c lab -n "__lab_using_cmd init bastion standalone start" -l domain -d 'Internal domain for hostnames' -x
complete -c lab -n "__lab_using_cmd init bastion standalone start" -l dhcp-mode -d 'DHCP mode: proxy or full' -x
complete -c lab -n "__lab_using_cmd init bastion standalone start" -l fedora -d 'Fedora version' -x
complete -c lab -n "__lab_using_cmd init bastion standalone start" -l arch -d 'Architecture' -x
complete -c lab -n "__lab_using_cmd init bastion standalone start" -l timezone -d 'Timezone' -x
complete -c lab -n "__lab_using_cmd init bastion standalone start" -l locale -d 'Locale' -x
complete -c lab -n "__lab_using_cmd init bastion standalone start" -l skip-dnsmasq -d 'Skip starting dnsmasq (for testing)'
complete -c lab -n "__lab_using_cmd init bastion standalone start" -l skip-artifacts -d 'Skip downloading boot artifacts (for testing)'
# init bastion standalone stop options
complete -c lab -n "__lab_using_cmd init bastion standalone stop" -l dir -d 'Bastion data directory' -x
# init bastion standalone status options
complete -c lab -n "__lab_using_cmd init bastion standalone status" -l dir -d 'Bastion data directory' -x
complete -c lab -n "__lab_using_cmd init bastion standalone status" -l port -d 'Bastion HTTP port' -x
# provision subcommands
complete -c lab -n "__lab_using_cmd provision" -a list -d 'List all known machines'
complete -c lab -n "__lab_using_cmd provision" -a install -d 'Queue a discovered machine for Fedora installation'
complete -c lab -n "__lab_using_cmd provision" -a reprovision -d 'Queue install + SSH reboot into PXE for reprovision'
complete -c lab -n "__lab_using_cmd provision" -a forget -d 'Remove a machine from bastion state'
# provision list options
complete -c lab -n "__lab_using_cmd provision list" -l port -d 'Bastion HTTP port' -x
# provision install options
complete -c lab -n "__lab_using_cmd provision install" -l role -d 'Machine role: worker or infra' -x
complete -c lab -n "__lab_using_cmd provision install" -l disk -d 'Target disk device (auto-detect if omitted)' -x
complete -c lab -n "__lab_using_cmd provision install" -l port -d 'Bastion HTTP port' -x
# provision reprovision options
complete -c lab -n "__lab_using_cmd provision reprovision" -l role -d 'Machine role: worker or infra' -x
complete -c lab -n "__lab_using_cmd provision reprovision" -l disk -d 'Target disk device (auto-detect if omitted)' -x
complete -c lab -n "__lab_using_cmd provision reprovision" -l port -d 'Bastion HTTP port' -x
# provision forget options
complete -c lab -n "__lab_using_cmd provision forget" -l port -d 'Bastion HTTP port' -x

6
bastion/completions/lab.bash → bastion/completions/labctl.bash
View File

@@ -1,7 +1,7 @@
# lab bash completions -- auto-generated by scripts/generate-completions.ts # labctl bash completions -- auto-generated by scripts/generate-completions.ts
# DO NOT EDIT MANUALLY -- run: pnpm completions:generate # DO NOT EDIT MANUALLY -- run: pnpm completions:generate
_lab() { _labctl() {
local cur prev words cword local cur prev words cword
_init_completion || return _init_completion || return
@@ -64,4 +64,4 @@ _lab() {
esac esac
} }
complete -F _lab lab complete -F _labctl labctl

91
bastion/completions/labctl.fish Normal file
View File

@@ -0,0 +1,91 @@
# labctl fish completions -- auto-generated by scripts/generate-completions.ts
# DO NOT EDIT MANUALLY -- run: pnpm completions:generate
complete -c labctl -e
complete -c labctl -f
# Global options
complete -c labctl -s v -l version -d 'Show version'
complete -c labctl -s h -l help -d 'Show help'
# Helper: test if a subcommand chain is active
function __labctl_using_cmd
set -l tokens (commandline -opc)
set -l expected $argv
set -l depth (count $expected)
set -l found 0
set -l i 1
for tok in $tokens[2..]
if string match -q -- "-*" $tok
continue
end
set i (math $i + 1)
set -l idx (math $i - 1)
if test $idx -le $depth
if test "$tok" != "$expected[$idx]"
return 1
end
set found (math $found + 1)
else
return 1
end
end
test $found -eq $depth
end
# Top-level commands
complete -c labctl -n "not __fish_seen_subcommand_from init provision" -a init -d 'Initialise infrastructure components'
complete -c labctl -n "not __fish_seen_subcommand_from init provision" -a provision -d 'Machine provisioning operations'
# init subcommands
complete -c labctl -n "__labctl_using_cmd init" -a bastion -d 'Bastion PXE server management'
# init bastion subcommands
complete -c labctl -n "__labctl_using_cmd init bastion" -a standalone -d 'Standalone bastion server lifecycle'
# init bastion standalone subcommands
complete -c labctl -n "__labctl_using_cmd init bastion standalone" -a start -d 'Start the bastion server (HTTP + dnsmasq PXE)'
complete -c labctl -n "__labctl_using_cmd init bastion standalone" -a stop -d 'Stop a running bastion server'
complete -c labctl -n "__labctl_using_cmd init bastion standalone" -a status -d 'Show bastion server status'
# init bastion standalone start options
complete -c labctl -n "__labctl_using_cmd init bastion standalone start" -l port -d 'HTTP port' -x
complete -c labctl -n "__labctl_using_cmd init bastion standalone start" -l dir -d 'Bastion data directory' -x
complete -c labctl -n "__labctl_using_cmd init bastion standalone start" -l domain -d 'Internal domain for hostnames' -x
complete -c labctl -n "__labctl_using_cmd init bastion standalone start" -l dhcp-mode -d 'DHCP mode: proxy or full' -x
complete -c labctl -n "__labctl_using_cmd init bastion standalone start" -l fedora -d 'Fedora version' -x
complete -c labctl -n "__labctl_using_cmd init bastion standalone start" -l arch -d 'Architecture' -x
complete -c labctl -n "__labctl_using_cmd init bastion standalone start" -l timezone -d 'Timezone' -x
complete -c labctl -n "__labctl_using_cmd init bastion standalone start" -l locale -d 'Locale' -x
complete -c labctl -n "__labctl_using_cmd init bastion standalone start" -l skip-dnsmasq -d 'Skip starting dnsmasq (for testing)'
complete -c labctl -n "__labctl_using_cmd init bastion standalone start" -l skip-artifacts -d 'Skip downloading boot artifacts (for testing)'
# init bastion standalone stop options
complete -c labctl -n "__labctl_using_cmd init bastion standalone stop" -l dir -d 'Bastion data directory' -x
# init bastion standalone status options
complete -c labctl -n "__labctl_using_cmd init bastion standalone status" -l dir -d 'Bastion data directory' -x
complete -c labctl -n "__labctl_using_cmd init bastion standalone status" -l port -d 'Bastion HTTP port' -x
# provision subcommands
complete -c labctl -n "__labctl_using_cmd provision" -a list -d 'List all known machines'
complete -c labctl -n "__labctl_using_cmd provision" -a install -d 'Queue a discovered machine for Fedora installation'
complete -c labctl -n "__labctl_using_cmd provision" -a reprovision -d 'Queue install + SSH reboot into PXE for reprovision'
complete -c labctl -n "__labctl_using_cmd provision" -a forget -d 'Remove a machine from bastion state'
# provision list options
complete -c labctl -n "__labctl_using_cmd provision list" -l port -d 'Bastion HTTP port' -x
# provision install options
complete -c labctl -n "__labctl_using_cmd provision install" -l role -d 'Machine role: worker or infra' -x
complete -c labctl -n "__labctl_using_cmd provision install" -l disk -d 'Target disk device (auto-detect if omitted)' -x
complete -c labctl -n "__labctl_using_cmd provision install" -l port -d 'Bastion HTTP port' -x
# provision reprovision options
complete -c labctl -n "__labctl_using_cmd provision reprovision" -l role -d 'Machine role: worker or infra' -x
complete -c labctl -n "__labctl_using_cmd provision reprovision" -l disk -d 'Target disk device (auto-detect if omitted)' -x
complete -c labctl -n "__labctl_using_cmd provision reprovision" -l port -d 'Bastion HTTP port' -x
# provision forget options
complete -c labctl -n "__labctl_using_cmd provision forget" -l port -d 'Bastion HTTP port' -x

14
bastion/nfpm.yaml
View File

@@ -1,4 +1,4 @@
name: lab name: labctl
arch: amd64 arch: amd64
version: 0.1.0 version: 0.1.0
release: "1" release: "1"
@@ -6,15 +6,15 @@ maintainer: michal
description: Lab infrastructure CLI for bare-metal provisioning description: Lab infrastructure CLI for bare-metal provisioning
license: MIT license: MIT
contents: contents:
- src: ./dist/lab - src: ./dist/labctl
dst: /usr/bin/lab dst: /usr/bin/labctl
file_info: file_info:
mode: 0755 mode: 0755
- src: ./completions/lab.bash - src: ./completions/labctl.bash
dst: /usr/share/bash-completion/completions/lab dst: /usr/share/bash-completion/completions/labctl
file_info: file_info:
mode: 0644 mode: 0644
- src: ./completions/lab.fish - src: ./completions/labctl.fish
dst: /usr/share/fish/vendor_completions.d/lab.fish dst: /usr/share/fish/vendor_completions.d/labctl.fish
file_info: file_info:
mode: 0644 mode: 0644

16
bastion/scripts/build-rpm.sh
View File

@@ -22,7 +22,7 @@ usage() {
cat <<EOF cat <<EOF
Usage: $(basename "$0") [OPTIONS] Usage: $(basename "$0") [OPTIONS]
Build lab binary and produce RPM/DEB packages. Build labctl binary and produce RPM/DEB packages.
Options: Options:
--arch ARCH Target architecture: x86_64 or arm64 (default: host arch) --arch ARCH Target architecture: x86_64 or arm64 (default: host arch)
@@ -106,7 +106,7 @@ build_arch() {
bun_target="$(bun_target_for "$arch")" bun_target="$(bun_target_for "$arch")"
nfpm_arch="$(nfpm_arch_for "$arch")" nfpm_arch="$(nfpm_arch_for "$arch")"
binary_name="dist/lab-${arch}" binary_name="dist/labctl-${arch}"
echo "" echo ""
echo "==> Bundling standalone binary for ${arch}..." echo "==> Bundling standalone binary for ${arch}..."
@@ -117,7 +117,7 @@ build_arch() {
local tmpconfig local tmpconfig
tmpconfig="$(mktemp /tmp/nfpm-XXXXXX.yaml)" tmpconfig="$(mktemp /tmp/nfpm-XXXXXX.yaml)"
sed -e "s|^arch:.*|arch: ${nfpm_arch}|" \ sed -e "s|^arch:.*|arch: ${nfpm_arch}|" \
-e "s|src: ./dist/lab$|src: ./${binary_name}|" \ -e "s|src: ./dist/labctl$|src: ./${binary_name}|" \
nfpm.yaml > "$tmpconfig" nfpm.yaml > "$tmpconfig"
nfpm pkg --config "$tmpconfig" --packager rpm --target dist/ nfpm pkg --config "$tmpconfig" --packager rpm --target dist/
@@ -125,7 +125,7 @@ build_arch() {
local rpm_arch local rpm_arch
rpm_arch="$(rpm_arch_for "$arch")" rpm_arch="$(rpm_arch_for "$arch")"
RPM_FILE=$(ls dist/lab-*.${rpm_arch}.rpm 2>/dev/null | head -1) RPM_FILE=$(ls dist/labctl-*.${rpm_arch}.rpm 2>/dev/null | head -1)
echo "==> Built: $RPM_FILE" echo "==> Built: $RPM_FILE"
echo " Size: $(du -h "$RPM_FILE" | cut -f1)" echo " Size: $(du -h "$RPM_FILE" | cut -f1)"
@@ -136,13 +136,13 @@ build_arch() {
tmpconfig="$(mktemp /tmp/nfpm-XXXXXX.yaml)" tmpconfig="$(mktemp /tmp/nfpm-XXXXXX.yaml)"
sed -e "s|^arch:.*|arch: ${nfpm_arch}|" \ sed -e "s|^arch:.*|arch: ${nfpm_arch}|" \
-e "s|src: ./dist/lab$|src: ./${binary_name}|" \ -e "s|src: ./dist/labctl$|src: ./${binary_name}|" \
nfpm.yaml > "$tmpconfig" nfpm.yaml > "$tmpconfig"
nfpm pkg --config "$tmpconfig" --packager deb --target dist/ nfpm pkg --config "$tmpconfig" --packager deb --target dist/
rm -f "$tmpconfig" rm -f "$tmpconfig"
DEB_FILE=$(ls dist/lab_*_${deb_arch}.deb 2>/dev/null | head -1) DEB_FILE=$(ls dist/labctl_*_${deb_arch}.deb 2>/dev/null | head -1)
echo "==> Built: $DEB_FILE" echo "==> Built: $DEB_FILE"
echo " Size: $(du -h "$DEB_FILE" | cut -f1)" echo " Size: $(du -h "$DEB_FILE" | cut -f1)"
} }
@@ -162,7 +162,7 @@ echo "==> Generating shell completions..."
pnpm completions:generate pnpm completions:generate
mkdir -p dist mkdir -p dist
rm -f dist/lab dist/lab-x86_64 dist/lab-arm64 dist/lab-*.rpm dist/lab*.deb rm -f dist/labctl dist/labctl-x86_64 dist/labctl-arm64 dist/labctl-*.rpm dist/labctl*.deb
if [ "$BUILD_ALL" = true ]; then if [ "$BUILD_ALL" = true ]; then
build_arch "x86_64" build_arch "x86_64"
@@ -177,4 +177,4 @@ fi
echo "" echo ""
echo "==> Build complete. Artifacts in dist/:" echo "==> Build complete. Artifacts in dist/:"
ls -lh dist/lab* 2>/dev/null || echo " (none)" ls -lh dist/labctl* 2>/dev/null || echo " (none)"

16
bastion/scripts/generate-completions.ts
View File

@@ -330,29 +330,29 @@ async function main(): Promise<void> {
const bashContent = generateBash(tree); const bashContent = generateBash(tree);
const completionsDir = join(ROOT, 'completions'); const completionsDir = join(ROOT, 'completions');
const fishPath = join(completionsDir, 'lab.fish'); const fishPath = join(completionsDir, 'labctl.fish');
const bashPath = join(completionsDir, 'lab.bash'); const bashPath = join(completionsDir, 'labctl.bash');
if (mode === '--check') { if (mode === '--check') {
let stale = false; let stale = false;
try { try {
const currentFish = readFileSync(fishPath, 'utf-8'); const currentFish = readFileSync(fishPath, 'utf-8');
if (currentFish !== fishContent) { if (currentFish !== fishContent) {
console.error('completions/lab.fish is stale'); console.error('completions/labctl.fish is stale');
stale = true; stale = true;
} }
} catch { } catch {
console.error('completions/lab.fish does not exist'); console.error('completions/labctl.fish does not exist');
stale = true; stale = true;
} }
try { try {
const currentBash = readFileSync(bashPath, 'utf-8'); const currentBash = readFileSync(bashPath, 'utf-8');
if (currentBash !== bashContent) { if (currentBash !== bashContent) {
console.error('completions/lab.bash is stale'); console.error('completions/labctl.bash is stale');
stale = true; stale = true;
} }
} catch { } catch {
console.error('completions/lab.bash does not exist'); console.error('completions/labctl.bash does not exist');
stale = true; stale = true;
} }
if (stale) { if (stale) {
@@ -373,9 +373,9 @@ async function main(): Promise<void> {
} }
// Default: print to stdout // Default: print to stdout
console.log('=== completions/lab.fish ==='); console.log('=== completions/labctl.fish ===');
console.log(fishContent); console.log(fishContent);
console.log('=== completions/lab.bash ==='); console.log('=== completions/labctl.bash ===');
console.log(bashContent); console.log(bashContent);
} }

10
bastion/scripts/publish-deb.sh
View File

@@ -21,7 +21,7 @@ if [ -z "$GITEA_TOKEN" ]; then
exit 1 exit 1
fi fi
DEB_FILE=$(ls dist/lab*.deb 2>/dev/null | head -1) DEB_FILE=$(ls dist/labctl*.deb 2>/dev/null | head -1)
if [ -z "$DEB_FILE" ]; then if [ -z "$DEB_FILE" ]; then
echo "Error: No DEB found in dist/. Run scripts/build-rpm.sh first." echo "Error: No DEB found in dist/. Run scripts/build-rpm.sh first."
exit 1 exit 1
@@ -63,10 +63,10 @@ echo "==> Published successfully!"
# Ensure package is linked to the repository # Ensure package is linked to the repository
source "$SCRIPT_DIR/link-package.sh" source "$SCRIPT_DIR/link-package.sh"
link_package "debian" "lab" link_package "debian" "labctl"
echo "" echo ""
echo "Install with:" echo "Install with:"
echo " echo \"deb ${GITEA_PUBLIC_URL}/api/packages/${GITEA_OWNER}/debian trixie main\" | sudo tee /etc/apt/sources.list.d/lab.list" echo " echo \"deb ${GITEA_PUBLIC_URL}/api/packages/${GITEA_OWNER}/debian trixie main\" | sudo tee /etc/apt/sources.list.d/labctl.list"
echo " curl -fsSL ${GITEA_PUBLIC_URL}/api/packages/${GITEA_OWNER}/debian/repository.key | sudo gpg --dearmor -o /etc/apt/keyrings/lab.gpg" echo " curl -fsSL ${GITEA_PUBLIC_URL}/api/packages/${GITEA_OWNER}/debian/repository.key | sudo gpg --dearmor -o /etc/apt/keyrings/labctl.gpg"
echo " sudo apt update && sudo apt install lab" echo " sudo apt update && sudo apt install labctl"

10
bastion/scripts/publish-rpm.sh
View File

@@ -21,7 +21,7 @@ if [ -z "$GITEA_TOKEN" ]; then
exit 1 exit 1
fi fi
RPM_FILE=$(ls dist/lab-*.rpm 2>/dev/null | head -1) RPM_FILE=$(ls dist/labctl-*.rpm 2>/dev/null | head -1)
if [ -z "$RPM_FILE" ]; then if [ -z "$RPM_FILE" ]; then
echo "Error: No RPM found in dist/. Run scripts/build-rpm.sh first." echo "Error: No RPM found in dist/. Run scripts/build-rpm.sh first."
exit 1 exit 1
@@ -35,13 +35,13 @@ echo "==> Publishing $RPM_FILE (version $RPM_VERSION) to ${GITEA_URL}..."
# Check if version already exists and delete it first # Check if version already exists and delete it first
EXISTING=$(curl -s -o /dev/null -w "%{http_code}" \ EXISTING=$(curl -s -o /dev/null -w "%{http_code}" \
-H "Authorization: token ${GITEA_TOKEN}" \ -H "Authorization: token ${GITEA_TOKEN}" \
"${GITEA_URL}/api/v1/packages/${GITEA_OWNER}/rpm/lab/${RPM_VERSION}") "${GITEA_URL}/api/v1/packages/${GITEA_OWNER}/rpm/labctl/${RPM_VERSION}")
if [ "$EXISTING" = "200" ]; then if [ "$EXISTING" = "200" ]; then
echo "==> Version $RPM_VERSION already exists, replacing..." echo "==> Version $RPM_VERSION already exists, replacing..."
curl -s -o /dev/null -X DELETE \ curl -s -o /dev/null -X DELETE \
-H "Authorization: token ${GITEA_TOKEN}" \ -H "Authorization: token ${GITEA_TOKEN}" \
"${GITEA_URL}/api/v1/packages/${GITEA_OWNER}/rpm/lab/${RPM_VERSION}" "${GITEA_URL}/api/v1/packages/${GITEA_OWNER}/rpm/labctl/${RPM_VERSION}"
fi fi
# Upload # Upload
@@ -55,8 +55,8 @@ echo "==> Published successfully!"
# Ensure package is linked to the repository # Ensure package is linked to the repository
source "$SCRIPT_DIR/link-package.sh" source "$SCRIPT_DIR/link-package.sh"
link_package "rpm" "lab" link_package "rpm" "labctl"
echo "" echo ""
echo "Install with:" echo "Install with:"
echo " sudo dnf install lab # if repo already configured" echo " sudo dnf install labctl # if repo already configured"

12
bastion/scripts/release.sh
View File

@@ -36,12 +36,12 @@ echo ""
# 5. Install locally (Fedora/RHEL only) # 5. Install locally (Fedora/RHEL only)
if [ -f /etc/fedora-release ] || [ -f /etc/redhat-release ]; then if [ -f /etc/fedora-release ] || [ -f /etc/redhat-release ]; then
echo "==> Installing locally..." echo "==> Installing locally..."
RPM_FILE=$(ls dist/lab-*.rpm 2>/dev/null | head -1) RPM_FILE=$(ls dist/labctl-*.rpm 2>/dev/null | head -1)
if [ -n "$RPM_FILE" ]; then if [ -n "$RPM_FILE" ]; then
sudo rpm -U --force "$RPM_FILE" sudo rpm -U --force "$RPM_FILE"
echo "" echo ""
echo "==> Installed:" echo "==> Installed:"
lab --version || echo "(lab binary installed)" labctl --version || echo "(labctl binary installed)"
else else
echo "==> WARNING: No RPM found in dist/, skipping local install." echo "==> WARNING: No RPM found in dist/, skipping local install."
fi fi
@@ -61,12 +61,12 @@ echo "=== Done! ==="
echo "" echo ""
echo "RPM install:" echo "RPM install:"
echo " sudo dnf config-manager --add-repo ${GITEA_PUBLIC_URL}/api/packages/${GITEA_OWNER}/rpm.repo" echo " sudo dnf config-manager --add-repo ${GITEA_PUBLIC_URL}/api/packages/${GITEA_OWNER}/rpm.repo"
echo " sudo dnf install lab" echo " sudo dnf install labctl"
echo "" echo ""
echo "DEB install (Debian/Ubuntu):" echo "DEB install (Debian/Ubuntu):"
echo " echo \"deb ${GITEA_PUBLIC_URL}/api/packages/${GITEA_OWNER}/debian trixie main\" | sudo tee /etc/apt/sources.list.d/lab.list" echo " echo \"deb ${GITEA_PUBLIC_URL}/api/packages/${GITEA_OWNER}/debian trixie main\" | sudo tee /etc/apt/sources.list.d/labctl.list"
echo " curl -fsSL ${GITEA_PUBLIC_URL}/api/packages/${GITEA_OWNER}/debian/repository.key | sudo gpg --dearmor -o /etc/apt/keyrings/lab.gpg" echo " curl -fsSL ${GITEA_PUBLIC_URL}/api/packages/${GITEA_OWNER}/debian/repository.key | sudo gpg --dearmor -o /etc/apt/keyrings/labctl.gpg"
echo " sudo apt update && sudo apt install lab" echo " sudo apt update && sudo apt install labctl"
echo "" echo ""
echo "Docker image:" echo "Docker image:"
echo " podman pull ${REGISTRY}/michal/lab-bastion:${VERSION}" echo " podman pull ${REGISTRY}/michal/lab-bastion:${VERSION}"

6
bastion/src/bastion/src/main.ts
View File

@@ -94,7 +94,7 @@ export async function startBastion(overrides: Partial<BastionConfig> = {}): Prom
// PID file management: kill old instance if running // PID file management: kill old instance if running
// Bastion needs root for dnsmasq (DHCP port 67) // Bastion needs root for dnsmasq (DHCP port 67)
if (!config.skipDnsmasq && process.getuid?.() !== 0) { if (!config.skipDnsmasq && process.getuid?.() !== 0) {
logger.error("Must run as root (dnsmasq needs DHCP/TFTP ports). Use: sudo lab init bastion standalone start"); logger.error("Must run as root (dnsmasq needs DHCP/TFTP ports). Use: sudo labctl init bastion standalone start");
process.exit(1); process.exit(1);
} }
@@ -262,8 +262,8 @@ function printBanner(config: BastionConfig): void {
console.log(" \x1b[33mIt will be inventoried and rebooted automatically.\x1b[0m"); console.log(" \x1b[33mIt will be inventoried and rebooted automatically.\x1b[0m");
console.log(""); console.log("");
console.log(" Commands (from another terminal):"); console.log(" Commands (from another terminal):");
console.log(" \x1b[1mlab list\x1b[0m -- show machines"); console.log(" \x1b[1mlabctl provision list\x1b[0m -- show machines");
console.log(" \x1b[1mlab install <mac> <hostname>\x1b[0m -- queue install"); console.log(" \x1b[1mlabctl provision install <mac> <hostname>\x1b[0m -- queue install");
console.log(""); console.log("");
console.log(" Press \x1b[1mCtrl-C\x1b[0m to stop."); console.log(" Press \x1b[1mCtrl-C\x1b[0m to stop.");
console.log(""); console.log("");

2
bastion/src/cli/package.json
View File

@@ -4,7 +4,7 @@
"private": true, "private": true,
"type": "module", "type": "module",
"bin": { "bin": {
"lab": "./dist/index.js" "labctl": "./dist/index.js"
}, },
"main": "./dist/index.js", "main": "./dist/index.js",
"types": "./dist/index.d.ts", "types": "./dist/index.d.ts",

2
bastion/src/cli/src/commands/serve.ts
View File

@@ -57,7 +57,7 @@ export function registerStartCommand(parent: Command): void {
// Add --foreground flag // Add --foreground flag
args.push("--foreground"); args.push("--foreground");
const child: ChildProcess = spawn(process.argv[0] ?? "lab", args, { const child: ChildProcess = spawn(process.argv[0] ?? "labctl", args, {
detached: true, detached: true,
stdio: ["ignore", "pipe", "pipe"], stdio: ["ignore", "pipe", "pipe"],
}); });

2
bastion/src/cli/src/index.ts
View File

@@ -19,7 +19,7 @@ export function createProgram(): Command {
const program = new Command(); const program = new Command();
program program
.name("lab") .name("labctl")
.description("Lab PXE Bastion -- discover-first bare-metal provisioning") .description("Lab PXE Bastion -- discover-first bare-metal provisioning")
.version(APP_VERSION); .version(APP_VERSION);

2
bastion/src/shared/src/constants/index.ts
View File

@@ -1,4 +1,4 @@
// Application-wide constants. // Application-wide constants.
export const APP_NAME = "lab"; export const APP_NAME = "labctl";
export const APP_VERSION = "0.1.0"; export const APP_VERSION = "0.1.0";