Compare commits
3 Commits
feat/nixos
...
af38655170
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
af38655170 | ||
| dcf5ac6b5e | |||
| d78de94f94 |
@@ -1,19 +1,15 @@
|
|||||||
name: NixOS Build & Test
|
name: Build NixOS config
|
||||||
run-name: Build ${{ gitea.event_name == 'push' && gitea.ref_name || format('PR #{0}', gitea.event.pull_request.number) }}
|
|
||||||
|
|
||||||
on:
|
on:
|
||||||
push:
|
pull_request:
|
||||||
branches:
|
branches: [ master ]
|
||||||
- master
|
|
||||||
paths:
|
paths:
|
||||||
- '**.nix'
|
- '**.nix'
|
||||||
- 'flake.lock'
|
- 'flake.lock'
|
||||||
- 'secrets/**'
|
- 'secrets/**'
|
||||||
- 'hosts/**'
|
- 'hosts/**'
|
||||||
- 'modules/**'
|
- 'modules/**'
|
||||||
pull_request:
|
push:
|
||||||
branches:
|
branches: [ master ]
|
||||||
- master
|
|
||||||
paths:
|
paths:
|
||||||
- '**.nix'
|
- '**.nix'
|
||||||
- 'flake.lock'
|
- 'flake.lock'
|
||||||
@@ -26,39 +22,12 @@ jobs:
|
|||||||
runs-on: nixos-builder
|
runs-on: nixos-builder
|
||||||
steps:
|
steps:
|
||||||
- name: Checkout
|
- name: Checkout
|
||||||
uses: actions/checkout@v4
|
|
||||||
with:
|
|
||||||
fetch-depth: 0
|
|
||||||
|
|
||||||
- name: Set up Nix environment
|
|
||||||
run: |
|
run: |
|
||||||
echo "extra-experimental-features = nix-command flakes" >> ~/.config/nix/nix.conf
|
git clone -b "${{ github.head_ref || github.ref_name }}" \
|
||||||
cat ~/.config/nix/nix.conf
|
https://gitea:${{ secrets.GITHUB_TOKEN }}@code.lazyworkhorse.net/gortium/infra.git .
|
||||||
|
git log --oneline -3
|
||||||
|
|
||||||
- name: Install nh (nix helper)
|
- name: Build NixOS config (lazyworkhorse)
|
||||||
run: |
|
run: |
|
||||||
nix --extra-experimental-features "nix-command flakes" \
|
nix --version
|
||||||
profile add nixpkgs#nh
|
nh os build .#lazyworkhorse 2>&1
|
||||||
nh --version
|
|
||||||
|
|
||||||
- name: Build NixOS configuration (lazyworkhorse)
|
|
||||||
run: |
|
|
||||||
nh os build .#lazyworkhorse
|
|
||||||
env:
|
|
||||||
NIX_CONFIG: "extra-experimental-features = nix-command flakes"
|
|
||||||
|
|
||||||
- name: Build NixOS configuration (cyt-pi)
|
|
||||||
run: |
|
|
||||||
nh os build .#cyt-pi
|
|
||||||
env:
|
|
||||||
NIX_CONFIG: "extra-experimental-features = nix-command flakes"
|
|
||||||
|
|
||||||
- name: Integration tests (placeholder)
|
|
||||||
run: |
|
|
||||||
echo "TODO: Add integration tests here"
|
|
||||||
echo ""
|
|
||||||
echo "Suggested future checks:"
|
|
||||||
echo " - nix flake check (evaluate all NixOS configs)"
|
|
||||||
echo " - Validate agenix secrets are decryptable"
|
|
||||||
echo " - Check services are defined correctly"
|
|
||||||
echo " - Run VM test if nixos-test infrastructure exists"
|
|
||||||
|
|||||||
Submodule assets/compose updated: d3f2e3b7b9...6b82a26c25
@@ -59,7 +59,6 @@
|
|||||||
./modules/nixos/filesystem/hoardingcow-mount.nix
|
./modules/nixos/filesystem/hoardingcow-mount.nix
|
||||||
./modules/nixos/services/docker_manager.nix
|
./modules/nixos/services/docker_manager.nix
|
||||||
./modules/nixos/services/open_code_server.nix
|
./modules/nixos/services/open_code_server.nix
|
||||||
./modules/nixos/services/staging-vm.nix
|
|
||||||
./modules/nixos/services/ollama_init_custom_models.nix
|
./modules/nixos/services/ollama_init_custom_models.nix
|
||||||
./modules/nixos/services/openclaw_node.nix
|
./modules/nixos/services/openclaw_node.nix
|
||||||
./modules/nixos/security/ai-worker-restricted.nix
|
./modules/nixos/security/ai-worker-restricted.nix
|
||||||
|
|||||||
@@ -207,7 +207,6 @@
|
|||||||
ai = {
|
ai = {
|
||||||
path = self + "/assets/compose/ai";
|
path = self + "/assets/compose/ai";
|
||||||
envFile = config.age.secrets.containers_env.path;
|
envFile = config.age.secrets.containers_env.path;
|
||||||
ports = [ 22000 ]; # Syncthing TCP sync
|
|
||||||
};
|
};
|
||||||
|
|
||||||
cloudstorage = {
|
cloudstorage = {
|
||||||
@@ -475,7 +474,7 @@
|
|||||||
services.openssh.settings = {
|
services.openssh.settings = {
|
||||||
PermitRootLogin = "no";
|
PermitRootLogin = "no";
|
||||||
MaxAuthTries = 3;
|
MaxAuthTries = 3;
|
||||||
MaxSessions = 20;
|
MaxSessions = 10;
|
||||||
LoginGraceTime = 30;
|
LoginGraceTime = 30;
|
||||||
ClientAliveInterval = 300;
|
ClientAliveInterval = 300;
|
||||||
ClientAliveCountMax = 2;
|
ClientAliveCountMax = 2;
|
||||||
|
|||||||
@@ -1,415 +0,0 @@
|
|||||||
{ config, lib, pkgs, ... }:
|
|
||||||
|
|
||||||
with lib;
|
|
||||||
|
|
||||||
let
|
|
||||||
cfg = config.services.staging-vm;
|
|
||||||
|
|
||||||
# Resolve the first IP in the subnet (the gateway address for the NAT network)
|
|
||||||
networkIp = head (splitString "/" cfg.network.subnet);
|
|
||||||
|
|
||||||
# ── pr-test-vm helper script ──────────────────────────────────────────
|
|
||||||
pr-test-vm = pkgs.writeShellScriptBin "pr-test-vm" ''
|
|
||||||
set -euo pipefail
|
|
||||||
|
|
||||||
LIBVIRT_URI="qemu:///system"
|
|
||||||
STORAGE_POOL="${cfg.storagePool}"
|
|
||||||
VM_DIR="${cfg.dataDir}"
|
|
||||||
NETWORK="${cfg.network.name}"
|
|
||||||
SCRIPT_NAME="$(basename "$0")"
|
|
||||||
|
|
||||||
usage() {
|
|
||||||
cat <<EOF
|
|
||||||
Usage: $SCRIPT_NAME <command> [options]
|
|
||||||
|
|
||||||
Commands:
|
|
||||||
build <nixos-config> [--name <name>] Build VM image from a NixOS config
|
|
||||||
start <vm-name> Start a VM
|
|
||||||
stop <vm-name> Gracefully shut down a VM
|
|
||||||
destroy <vm-name> Force-power-off and undefine a VM
|
|
||||||
ssh [user@]<vm-name> SSH into a running VM
|
|
||||||
console <vm-name> Connect to VM serial console
|
|
||||||
list List all staging VMs
|
|
||||||
status <vm-name> Show VM status
|
|
||||||
rebuild <vm-name> Redeploy the VM (stop + start)
|
|
||||||
|
|
||||||
Examples:
|
|
||||||
$SCRIPT_NAME build ./vm-config.nix --name my-test
|
|
||||||
$SCRIPT_NAME start my-test
|
|
||||||
$SCRIPT_NAME ssh root@my-test
|
|
||||||
EOF
|
|
||||||
exit 1
|
|
||||||
}
|
|
||||||
|
|
||||||
# Find the VM's IP address from the DHCP lease
|
|
||||||
vm_ip() {
|
|
||||||
local name="$1"
|
|
||||||
local mac
|
|
||||||
mac=$(${pkgs.libvirt}/bin/virsh -c "$LIBVIRT_URI" domiflist "$name" 2>/dev/null \
|
|
||||||
| ${pkgs.gawk}/bin/awk 'NR>2 && $1 ~ /^vnet/ {print $NF; exit}')
|
|
||||||
[ -z "$mac" ] && { echo "error: cannot find MAC for VM '$name'"; exit 1; }
|
|
||||||
|
|
||||||
local ip
|
|
||||||
ip=$(${pkgs.libvirt}/bin/virsh -c "$LIBVIRT_URI" net-dhcp-leases "$NETWORK" 2>/dev/null \
|
|
||||||
| ${pkgs.gawk}/bin/awk -v mac="$mac" '$0 ~ mac {gsub(/-.*/, "", $3); print $3; exit}')
|
|
||||||
[ -z "$ip" ] && { echo "error: no DHCP lease found for VM '$name' (MAC: $mac)"; exit 1; }
|
|
||||||
echo "$ip"
|
|
||||||
}
|
|
||||||
|
|
||||||
case "''${1:-help}" in
|
|
||||||
build)
|
|
||||||
shift
|
|
||||||
CONFIG="''${1:?Missing NixOS config path}"
|
|
||||||
VM_NAME="''${2:-}"
|
|
||||||
[ -f "$CONFIG" ] || { echo "error: config file not found: $CONFIG"; exit 1; }
|
|
||||||
|
|
||||||
# Extract name from --name flag or config basename
|
|
||||||
if [ "''${2:-}" = "--name" ] && [ -n "''${3:-}" ]; then
|
|
||||||
VM_NAME="$3"
|
|
||||||
elif [ -z "$VM_NAME" ] || [ "''${VM_NAME#--}" != "$VM_NAME" ]; then
|
|
||||||
VM_NAME="$(basename "$CONFIG" .nix)"
|
|
||||||
fi
|
|
||||||
|
|
||||||
BUILD_DIR="$VM_DIR/$VM_NAME"
|
|
||||||
IMAGE="$BUILD_DIR/disk-image.qcow2"
|
|
||||||
|
|
||||||
echo "==> Building VM '$VM_NAME' from config: $CONFIG"
|
|
||||||
mkdir -p "$BUILD_DIR"
|
|
||||||
|
|
||||||
# Build the NixOS VM derivation
|
|
||||||
nix build --no-link -f "$CONFIG" vm 2>&1 || {
|
|
||||||
# Fallback: try as flake output
|
|
||||||
echo "Trying flake build..."
|
|
||||||
nix build "''${CONFIG%/.nix}#nixosConfigurations.$VM_NAME.config.system.build.vm" --no-link 2>&1 || {
|
|
||||||
echo "error: failed to build VM (tried both import and flake)"
|
|
||||||
exit 1
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
echo "==> Build complete. Run 'pr-test-vm start $VM_NAME' to launch."
|
|
||||||
;;
|
|
||||||
|
|
||||||
start)
|
|
||||||
VM_NAME="''${1:?Missing VM name}"
|
|
||||||
IMAGE="$VM_DIR/$VM_NAME/disk-image.qcow2"
|
|
||||||
[ -f "$IMAGE" ] || { echo "error: no disk image found at $IMAGE. Build first."; exit 1; }
|
|
||||||
|
|
||||||
# Check if already running
|
|
||||||
STATE=$(${pkgs.libvirt}/bin/virsh -c "$LIBVIRT_URI" domstate "$VM_NAME" 2>/dev/null || echo "undefined")
|
|
||||||
if [ "$STATE" = "running" ]; then
|
|
||||||
echo "VM '$VM_NAME' is already running."
|
|
||||||
exit 0
|
|
||||||
fi
|
|
||||||
|
|
||||||
echo "==> Starting VM '$VM_NAME'..."
|
|
||||||
|
|
||||||
# Undefine if defined but not running
|
|
||||||
if [ "$STATE" != "undefined" ]; then
|
|
||||||
${pkgs.libvirt}/bin/virsh -c "$LIBVIRT_URI" undefine "$VM_NAME" 2>/dev/null || true
|
|
||||||
fi
|
|
||||||
|
|
||||||
# Define and start with virt-install
|
|
||||||
${pkgs.virt-manager}/bin/virt-install \
|
|
||||||
--connect "$LIBVIRT_URI" \
|
|
||||||
--name "$VM_NAME" \
|
|
||||||
--memory "${toString cfg.memory}" \
|
|
||||||
--vcpus "${toString cfg.vcpus}" \
|
|
||||||
--disk "$IMAGE",bus=virtio \
|
|
||||||
--import \
|
|
||||||
--network network="$NETWORK",model=virtio \
|
|
||||||
--graphics none \
|
|
||||||
--console pty,target_type=virtio \
|
|
||||||
--serial pty \
|
|
||||||
--memballoon virtio \
|
|
||||||
--rng /dev/urandom \
|
|
||||||
--noautoconsole \
|
|
||||||
--os-variant detect=on,name=generic
|
|
||||||
|
|
||||||
echo "==> VM '$VM_NAME' started. Get IP with: pr-test-vm status $VM_NAME"
|
|
||||||
;;
|
|
||||||
|
|
||||||
stop)
|
|
||||||
VM_NAME="''${1:?Missing VM name}"
|
|
||||||
echo "==> Stoping VM '$VM_NAME'..."
|
|
||||||
${pkgs.libvirt}/bin/virsh -c "$LIBVIRT_URI" shutdown "$VM_NAME" 2>/dev/null && {
|
|
||||||
echo "Waiting for VM to shut down..."
|
|
||||||
for i in $(seq 1 30); do
|
|
||||||
STATE=$(${pkgs.libvirt}/bin/virsh -c "$LIBVIRT_URI" domstate "$VM_NAME" 2>/dev/null || echo "undefined")
|
|
||||||
[ "$STATE" != "running" ] && { echo "VM stopped."; exit 0; }
|
|
||||||
sleep 2
|
|
||||||
done
|
|
||||||
echo "warning: VM did not shut down gracefully, use 'destroy' for force"
|
|
||||||
} || {
|
|
||||||
echo "VM '$VM_NAME' not running or does not exist."
|
|
||||||
}
|
|
||||||
;;
|
|
||||||
|
|
||||||
destroy)
|
|
||||||
VM_NAME="''${1:?Missing VM name}"
|
|
||||||
echo "==> Destroying VM '$VM_NAME'..."
|
|
||||||
${pkgs.libvirt}/bin/virsh -c "$LIBVIRT_URI" destroy "$VM_NAME" 2>/dev/null || true
|
|
||||||
${pkgs.libvirt}/bin/virsh -c "$LIBVIRT_URI" undefine "$VM_NAME" 2>/dev/null || true
|
|
||||||
echo "==> VM '$VM_NAME' destroyed and undefined."
|
|
||||||
;;
|
|
||||||
|
|
||||||
ssh)
|
|
||||||
TARGET="''${1:?Usage: $SCRIPT_NAME ssh [user@]<vm-name>}"
|
|
||||||
# Split user@hostname if present
|
|
||||||
if echo "$TARGET" | ${pkgs.gnugrep}/bin/grep -q '@'; then
|
|
||||||
USER="''${TARGET%@*}"
|
|
||||||
VM_NAME="''${TARGET#*@}"
|
|
||||||
else
|
|
||||||
VM_NAME="$TARGET"
|
|
||||||
USER=""
|
|
||||||
fi
|
|
||||||
|
|
||||||
IP=$(vm_ip "$VM_NAME") || exit 1
|
|
||||||
if [ -n "$USER" ]; then
|
|
||||||
exec ${pkgs.openssh}/bin/ssh -o StrictHostKeyChecking=no -o UserKnownHostsFile=/dev/null "''${USER}@''${IP}"
|
|
||||||
else
|
|
||||||
exec ${pkgs.openssh}/bin/ssh -o StrictHostKeyChecking=no -o UserKnownHostsFile=/dev/null "$IP"
|
|
||||||
fi
|
|
||||||
;;
|
|
||||||
|
|
||||||
console)
|
|
||||||
VM_NAME="''${1:?Missing VM name}"
|
|
||||||
exec ${pkgs.libvirt}/bin/virsh -c "$LIBVIRT_URI" console "$VM_NAME"
|
|
||||||
;;
|
|
||||||
|
|
||||||
list)
|
|
||||||
echo "Staging VMs:"
|
|
||||||
${pkgs.libvirt}/bin/virsh -c "$LIBVIRT_URI" list --all
|
|
||||||
echo ""
|
|
||||||
echo "Active networks:"
|
|
||||||
${pkgs.libvirt}/bin/virsh -c "$LIBVIRT_URI" net-list
|
|
||||||
echo ""
|
|
||||||
echo "Storage pools:"
|
|
||||||
${pkgs.libvirt}/bin/virsh -c "$LIBVIRT_URI" pool-list
|
|
||||||
;;
|
|
||||||
|
|
||||||
status)
|
|
||||||
VM_NAME="''${1:?Missing VM name}"
|
|
||||||
echo "VM: $VM_NAME"
|
|
||||||
STATE=$(${pkgs.libvirt}/bin/virsh -c "$LIBVIRT_URI" domstate "$VM_NAME" 2>/dev/null || echo "not found")
|
|
||||||
echo "State: $STATE"
|
|
||||||
if [ "$STATE" = "running" ]; then
|
|
||||||
IP=$(vm_ip "$VM_NAME" 2>/dev/null || echo "N/A")
|
|
||||||
echo "IP: $IP"
|
|
||||||
${pkgs.libvirt}/bin/virsh -c "$LIBVIRT_URI" dommemstat "$VM_NAME" 2>/dev/null | head -3 || true
|
|
||||||
fi
|
|
||||||
;;
|
|
||||||
|
|
||||||
rebuild)
|
|
||||||
VM_NAME="''${1:?Missing VM name}"
|
|
||||||
"$0" destroy "$VM_NAME"
|
|
||||||
"$0" start "$VM_NAME"
|
|
||||||
;;
|
|
||||||
|
|
||||||
help|--help|-h)
|
|
||||||
usage
|
|
||||||
;;
|
|
||||||
|
|
||||||
*)
|
|
||||||
usage
|
|
||||||
;;
|
|
||||||
esac
|
|
||||||
'';
|
|
||||||
in
|
|
||||||
{
|
|
||||||
options.services.staging-vm = {
|
|
||||||
enable = mkEnableOption "Staging VM infrastructure with libvirt/KVM";
|
|
||||||
|
|
||||||
network = {
|
|
||||||
name = mkOption {
|
|
||||||
type = types.str;
|
|
||||||
default = "staging";
|
|
||||||
description = "Name of the libvirt NAT network for staging VMs";
|
|
||||||
};
|
|
||||||
|
|
||||||
bridge = mkOption {
|
|
||||||
type = types.str;
|
|
||||||
default = "virbr1";
|
|
||||||
description = "Bridge interface name for the staging network";
|
|
||||||
};
|
|
||||||
|
|
||||||
subnet = mkOption {
|
|
||||||
type = types.str;
|
|
||||||
default = "192.168.122.0/24";
|
|
||||||
description = "NAT network subnet in CIDR notation";
|
|
||||||
};
|
|
||||||
|
|
||||||
dhcpStart = mkOption {
|
|
||||||
type = types.str;
|
|
||||||
default = "192.168.122.2";
|
|
||||||
description = "Start of the DHCP range";
|
|
||||||
};
|
|
||||||
|
|
||||||
dhcpEnd = mkOption {
|
|
||||||
type = types.str;
|
|
||||||
default = "192.168.122.254";
|
|
||||||
description = "End of the DHCP range";
|
|
||||||
};
|
|
||||||
};
|
|
||||||
|
|
||||||
storagePool = mkOption {
|
|
||||||
type = types.str;
|
|
||||||
default = "/var/lib/libvirt/images";
|
|
||||||
description = "Directory path for the libvirt storage pool";
|
|
||||||
};
|
|
||||||
|
|
||||||
dataDir = mkOption {
|
|
||||||
type = types.str;
|
|
||||||
default = "/var/lib/staging-vm";
|
|
||||||
description = "Directory for staging VM test data (images, cloud-init configs)";
|
|
||||||
};
|
|
||||||
|
|
||||||
memory = mkOption {
|
|
||||||
type = types.int;
|
|
||||||
default = 2048;
|
|
||||||
description = "Default RAM in MiB for staging VMs";
|
|
||||||
};
|
|
||||||
|
|
||||||
vcpus = mkOption {
|
|
||||||
type = types.int;
|
|
||||||
default = 2;
|
|
||||||
description = "Default number of vCPUs for staging VMs";
|
|
||||||
};
|
|
||||||
};
|
|
||||||
|
|
||||||
config = mkIf cfg.enable {
|
|
||||||
# ── libvirtd with QEMU/KVM ──────────────────────────────────────────
|
|
||||||
virtualisation.libvirtd = {
|
|
||||||
enable = true;
|
|
||||||
|
|
||||||
qemu = {
|
|
||||||
package = pkgs.qemu_kvm;
|
|
||||||
runAsRoot = true;
|
|
||||||
|
|
||||||
swtpm = {
|
|
||||||
enable = true;
|
|
||||||
};
|
|
||||||
|
|
||||||
ovmf = {
|
|
||||||
enable = true;
|
|
||||||
packages = [ pkgs.OVMF ];
|
|
||||||
};
|
|
||||||
};
|
|
||||||
|
|
||||||
# Allow the staging bridge for guest networking
|
|
||||||
allowedBridges = [ cfg.network.bridge ];
|
|
||||||
};
|
|
||||||
|
|
||||||
# ── System packages ─────────────────────────────────────────────────
|
|
||||||
environment.systemPackages = with pkgs; [
|
|
||||||
libvirt # virsh, virt-admin
|
|
||||||
qemu_kvm # QEMU/KVM
|
|
||||||
swtpm # Software TPM
|
|
||||||
OVMF # UEFI firmware for VMs
|
|
||||||
virt-manager # GUI management
|
|
||||||
virt-viewer # SPICE/VNC viewer
|
|
||||||
libguestfs # virt-install, virt-customize, guestfish
|
|
||||||
cdrtools # genisoimage for cloud-init ISOs
|
|
||||||
jq # JSON parsing
|
|
||||||
gawk # awk for DHCP lease parsing
|
|
||||||
gnugrep # grep
|
|
||||||
];
|
|
||||||
|
|
||||||
# ── User permissions ────────────────────────────────────────────────
|
|
||||||
users.users.gortium.extraGroups = [ "libvirtd" ];
|
|
||||||
|
|
||||||
# ── Directories ─────────────────────────────────────────────────────
|
|
||||||
systemd.tmpfiles.rules = [
|
|
||||||
"d ${cfg.storagePool} 0755 root root -"
|
|
||||||
"d ${cfg.dataDir} 0755 root root -"
|
|
||||||
];
|
|
||||||
|
|
||||||
# ── Default NAT network definition ──────────────────────────────────
|
|
||||||
systemd.services.define-staging-network = {
|
|
||||||
description = "Define the staging libvirt NAT network";
|
|
||||||
after = [ "libvirtd.service" ];
|
|
||||||
requires = [ "libvirtd.service" ];
|
|
||||||
wantedBy = [ "multi-user.target" ];
|
|
||||||
before = [ "define-staging-pool.service" ];
|
|
||||||
serviceConfig = {
|
|
||||||
Type = "oneshot";
|
|
||||||
RemainAfterExit = true;
|
|
||||||
};
|
|
||||||
script = let
|
|
||||||
networkXml = pkgs.writeText "staging-network.xml" ''
|
|
||||||
<network>
|
|
||||||
<name>${cfg.network.name}</name>
|
|
||||||
<forward mode='nat'/>
|
|
||||||
<bridge name='${cfg.network.bridge}' stp='on' delay='0'/>
|
|
||||||
<ip address='${networkIp}' netmask='255.255.255.0'>
|
|
||||||
<dhcp>
|
|
||||||
<range start='${cfg.network.dhcpStart}' end='${cfg.network.dhcpEnd}'/>
|
|
||||||
</dhcp>
|
|
||||||
</ip>
|
|
||||||
</network>
|
|
||||||
'';
|
|
||||||
in ''
|
|
||||||
set -e
|
|
||||||
${pkgs.libvirt}/bin/virsh -c qemu:///system net-info "${cfg.network.name}" 2>/dev/null && {
|
|
||||||
echo "Network '${cfg.network.name}' already exists"
|
|
||||||
} || {
|
|
||||||
echo "Defining network '${cfg.network.name}'..."
|
|
||||||
${pkgs.libvirt}/bin/virsh -c qemu:///system net-define "${networkXml}"
|
|
||||||
}
|
|
||||||
${pkgs.libvirt}/bin/virsh -c qemu:///system net-autostart "${cfg.network.name}"
|
|
||||||
# Start the network if not already active
|
|
||||||
STATE=$(${pkgs.libvirt}/bin/virsh -c qemu:///system net-state "${cfg.network.name}" 2>/dev/null || echo "inactive")
|
|
||||||
if [ "$STATE" != "active" ]; then
|
|
||||||
${pkgs.libvirt}/bin/virsh -c qemu:///system net-start "${cfg.network.name}"
|
|
||||||
fi
|
|
||||||
echo "Network '${cfg.network.name}' is ready."
|
|
||||||
'';
|
|
||||||
};
|
|
||||||
|
|
||||||
# ── Storage pool definition ─────────────────────────────────────────
|
|
||||||
systemd.services.define-staging-pool = {
|
|
||||||
description = "Define the staging libvirt storage pool";
|
|
||||||
after = [ "libvirtd.service" "define-staging-network.service" ];
|
|
||||||
requires = [ "libvirtd.service" ];
|
|
||||||
wantedBy = [ "multi-user.target" ];
|
|
||||||
serviceConfig = {
|
|
||||||
Type = "oneshot";
|
|
||||||
RemainAfterExit = true;
|
|
||||||
};
|
|
||||||
script = ''
|
|
||||||
set -e
|
|
||||||
${pkgs.libvirt}/bin/virsh -c qemu:///system pool-info staging 2>/dev/null && {
|
|
||||||
echo "Storage pool 'staging' already exists"
|
|
||||||
} || {
|
|
||||||
echo "Defining storage pool 'staging' at ${cfg.storagePool}..."
|
|
||||||
${pkgs.libvirt}/bin/virsh -c qemu:///system pool-define-as \
|
|
||||||
--name staging --type dir --target "${cfg.storagePool}"
|
|
||||||
}
|
|
||||||
${pkgs.libvirt}/bin/virsh -c qemu:///system pool-autostart staging
|
|
||||||
STATE=$(${pkgs.libvirt}/bin/virsh -c qemu:///system pool-state staging 2>/dev/null || echo "inactive")
|
|
||||||
if [ "$STATE" != "running" ]; then
|
|
||||||
${pkgs.libvirt}/bin/virsh -c qemu:///system pool-build staging
|
|
||||||
${pkgs.libvirt}/bin/virsh -c qemu:///system pool-start staging
|
|
||||||
fi
|
|
||||||
echo "Storage pool 'staging' is ready."
|
|
||||||
'';
|
|
||||||
};
|
|
||||||
|
|
||||||
# ── Firewall rules for libvirt guests ───────────────────────────────
|
|
||||||
networking.firewall = {
|
|
||||||
# Trust the bridge interface to allow guest traffic
|
|
||||||
trustedInterfaces = [ cfg.network.bridge ];
|
|
||||||
|
|
||||||
extraCommands = mkAfter ''
|
|
||||||
# Allow forwarding between the staging bridge and the outside world
|
|
||||||
iptables -I FORWARD -i ${cfg.network.bridge} -j ACCEPT 2>/dev/null || true
|
|
||||||
iptables -I FORWARD -o ${cfg.network.bridge} -m conntrack --ctstate RELATED,ESTABLISHED -j ACCEPT 2>/dev/null || true
|
|
||||||
|
|
||||||
# NAT for guest outbound traffic
|
|
||||||
iptables -t nat -I POSTROUTING -s ${cfg.network.subnet} -j MASQUERADE 2>/dev/null || true
|
|
||||||
'';
|
|
||||||
};
|
|
||||||
|
|
||||||
# ── pr-test-vm helper script ────────────────────────────────────────
|
|
||||||
environment.systemPackages = [ pr-test-vm ];
|
|
||||||
};
|
|
||||||
}
|
|
||||||
@@ -1,36 +1,36 @@
|
|||||||
-----BEGIN AGE ENCRYPTED FILE-----
|
-----BEGIN AGE ENCRYPTED FILE-----
|
||||||
YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IHNzaC1lZDI1NTE5IEdoTUQ4QSBWNEpt
|
YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IHNzaC1lZDI1NTE5IEdoTUQ4QSB5c1B3
|
||||||
cGFNeVBBaDRqb3pLSEZGQW0wb3VmVnBoZCswUFkzbnBLUnJ0QTNrClRqVkk4RUVO
|
anRidlRvdUIxUGZWVEw0VDQ5L1QzRHdlVHJHRDRvNEF6M2dNQVNrCk50aXF6ekxq
|
||||||
d29KYjd5YUcwankvaTFmVHUxQVpDT2ZYWHRaY3JXTUtQMU0KLT4gKXBtQ3UsXi1n
|
WnVCUXBZbEJsVk1BMmQvN2ZpNmp3ZHYvSUlvakN2VTdZUVkKLT4gMyR8Syh7ZyMt
|
||||||
cmVhc2UgNnwxYCBXVyA/KCQmIHt9NAo3OTZVUHR2UXkvaEFwY0ZBdEJsaFpsbHJ0
|
Z3JlYXNlIFs3ezgmZDAKZ2hhNzZmU2wzdkNkTnliL0NiWWlQbnppcmRLdHZVYWdm
|
||||||
cklKcDVHcEdWMEdPSkpnN0FiRU43RW5hUWFMdjR3WFRRSFBLSGlmClM3cTNJWlNM
|
bG5LZ0p3Ci0tLSBMYmxYa0hCbnVham05dVo5eEJXTEhob2F1YXhzNlNoVXBwNmNz
|
||||||
TExkdHdXUHJISkNIaE1TTUxUc1NUWkV1a09HeFU3bVZwQXMKLS0tIGhOcXFTUElS
|
M0RVS0xRCt2jk8SwZ4McFmBkWknNs0phZSD3deFAh1nvRE9fSp82yNG0SoFE8O8e
|
||||||
azJJNnEreUhMWTJBaVZGSTJPRUFqQkVYS01KRENUVVpZSDgK8+8onFejroBo7MeO
|
HaMP5fO1Y7gW7Nqvvtr0Fs2AXwxzLtVRc8+XYxDuhRY9Rq5w/VHaEt9fS2OQioml
|
||||||
dW+so4lOsq4zJKn3f0cxmCFg1f0X8zt6h4Uc3A5Cvr1uU+6yw1FWmJ7xa3jJz3lO
|
hcTw3MhBGAN4JVhFz/lUOEO82jd3lKig95fGjA2SpwfxlAMhepe7OmJ4Hpe+QrPt
|
||||||
EEaKQJXYC+xIIKGcA7qILa0SFp4a/4OuYjcg27HrlPhg7u5wDhQrd0LdVEe1Xngp
|
orXgJHG2Ssu2mLgpnIr3mYVXKfNMy9TUGkh5hM1qR2TidtcefExYegCesjRNmSw/
|
||||||
ZivX7P7HwIna3X8C+TL+K2v/AG2N/z86cdKfRvxyMKNbHhYw+CfHEnWgh8tJ++4h
|
KVe8wTdF1dr+R+vQDGXZleLpLzKZHATw36+GxGUfpm6iWuDc3lBsjHrVVlm2mz7o
|
||||||
G9evNniuNqte6cQaRe7jODfPNW4FuY/Sb7barlJ/M9iAQdYAdyLAzU1LABeHeUfD
|
XM+bHDnnUHSFXhHh5gDIoRi/kI3w5b1F2psKXFAGOQq4osrYInoGdvMrGWDvhGZS
|
||||||
wtHjxy9DUZ55Vg8bB8M2JJU9MkoRT4ewiVd9LeC1GWeVmKsm93wsmrov714i7U2j
|
GbVyAoZKYOmlqjM/AY4vMc5N7ICsDJqugFi9fDSmckfgzvUYVbzuv7D+1gtmjAzi
|
||||||
wHtDkjqEF2MmzuQc18sjNaAHiwz8j6o5xU2L/Q4+Q707yISWG7RGZYh389Cr1rnw
|
+e/vhujRjE2xaD7kIeO6UFq0lZpMoQV3tX5kJG0OOuF1GlZzw22SUc67w25JNHSE
|
||||||
siUq/Vunqw2wk13+J/4vu9nqt5mMktBaCtp+QiWIurjwB5LUAyChrSm+dg5lb0Mt
|
GRnm+MN7XfvtlRZyyYERMs6j829H6zOQL96YBpzxc1yx07K+SMKewHhbm4pyrcDD
|
||||||
UhSc0lq1+E3vxAXM2Hmk+vP86VD+6WJvAU82VFApF1s6zG2FU1/AcOVVf54nan/q
|
dVZxNMHv+B+F2tw1KFMl+Go3pyQp0p+CgiSWUoyvBzK0BwZ7XXy93GWmuAN/dhpU
|
||||||
f+rgSFfASHQCYSblUJHyEtwLNsWEmTGmOEn1buUKD/H0zatPQnc0rYpjlx2V0Sjd
|
YhXIiqXgexN6a/0Z6OTah8xW1sr6EYvIGWnXdUUB+azEI2uykX00MO10szDJ/vkh
|
||||||
6yB5+wPrZ0AkN1pjcsPKOv8Kaog2DzqIjib+SaSTaRxWHQEb9uzvaReAcYI5HOpE
|
DZUafMtlgMKU+fBbM0Tr0QM1R30BWNJCjHgsoU7mxbyiuFYuyAC72T70z5WdQTst
|
||||||
gkC040HN33BItATbo4+hz70Im8Ni/VXD+g6yzM6Hj1hJL+PinTKeg5keQRFIZjMx
|
jf4NJdc4FKOHA6ydLoyzi7ey05nxm8zquHW1kCwLVUMhvjUPbQhpWQbU8DvlB6l1
|
||||||
grzievB2wVBBgLgN3qMdTFmpplaL7iL702JjXZUTTK9Izp+9wiCsV1fTa53FWDht
|
nGqWBUTqeorstDcvTTEjySPrp7PIUMj+Vt2MiFCQa5eh2sZWFJsYrA6CEtGFTpyU
|
||||||
ylFL5SWElqXjK+QBXxAe+Jk6VQov5HI21YDXL67S554ABeRok23wxrQ31TCI4xq9
|
og8rGtS7UBukgsp7rucLO8MYt0/ZauUcEg0jcbWc+KOWtC9MPedv6gTLfaxpk1xy
|
||||||
PQV7VtNRjyVud7S29m3OwpWOsgTZhn+JclHj2v4bNJzJkJnZRTmcvGPktzRI5+R4
|
iY+7Y+H860Pt1WvVFYg9/0fj0wz92DqR08oWvOjR7+EekhacqAHfTm6PpLLKSeHw
|
||||||
e5vxVhGnJDzI71txaHl8+xS1lu9VzCQUrxX6TXyTRV4KjIOz0g06JOBgmBRBvJca
|
M1D0dElJ6L1hkmHr88q7YwPfMzObmRbKh28ayeoLOprx3ezYr4t0qWWAKysvkkuo
|
||||||
7MZbC65xpisl/gyLRbgkVga3t94dPV+dpZsn8eq6427IyRbKslJefatggR9//c6I
|
uhvfqngZefj7CloVCaQVM0Du6p74wV5UEkxopJyMc3s4oEkauX2DgVHzb0NJ+a3n
|
||||||
5N5fl0fR3gJQMB+HRbipBH2YsdbdWJyb4Nn6STZxIfrqoG/xC6C1raF0xK7hUx6i
|
KyatZoIEOK+yBDuRw9+c3FdxOmSc8EEdDPh5tXHOfixdxHlMXeNWo7VwtR7ThPcj
|
||||||
4DUDSPohM8fOIswQPfE+FH3eygfzu/Ln5+ghsgHTEhgFvmgMvyxaAt6kHIzIUhMX
|
wRHwN9dgzW4AbYQAHKSOCGGqlhINYVxDviwhTT+PYB/w7x42id8aMW2KOhgGcVCD
|
||||||
M3dASr4VPDpIXuXsRWwYLEifhzxsuvwVxfwtsnCaR6XKijsYECWGDdYOWHdleeqx
|
fyQQJN5ANCxglu/T0+SmXikPQkuJqzOuE0+qqz1sMuKF3KLJB5ppys1Ygmpm27Up
|
||||||
wDPhxEesfFVhKxhrKY9Ir8k9/FFBKQU/3GjW4+SMAg5Al1YEzxshP9vKuVcsei7W
|
oaqBa7JS4yJc53rPSEy4r10GqBbvYNDmcEWZilSrj5aTB7nhq+RVyTwmAU+qfLmK
|
||||||
JDwAwotNXaCm6NBckiyZJE53ou6+gckPY7V9cOfnuH74Z9ywkFzB3HW3ZlonaGyM
|
NgGi05oyVGYBX135c6eXkEtKg1HiH5LkqkvLGIDYkAeiLmqXv6N7hGphBF7fdLXw
|
||||||
oGmLGcccavFtyhg5s/As4i6X8ARIpDiwe59Pn3GNXMctySqIrrr2ogUoXgrfFCie
|
g8Anrn+JYaOc/6ZntCPLwm4cV4KE2hswSReHFrposb6M4/Kbx8Yf2iMx07IQ3v/R
|
||||||
6GOTdeMW7GeOSdJUxCofghlspS/nq01Og77VI/beWYrIwLubSka6Zaltww9zgObk
|
z0sIihHjfOqLi3kafL4N0BDoLAQdjbxqkx1z0VcGVkPliS0mDro17b1KfxPsI04/
|
||||||
/FGEMgFkEpq7iyCvYSPA8F46pJKvnMP3S84AWCPmcTcHeg4lwGPvs6btexXBGdoz
|
k6xTWoBQAhcCkH+NpT0VRNCM7f6aycsJekfakTRRqg5rwFimqReMSJcKCLZdoezi
|
||||||
nkCyq7wdH5Nngm7jUbl88LtaLZPAQkuqXphBVTnrF9Ofbnb4iRZ2Op4xpx9rGyvx
|
iAIMHPqPW1+sjwA7Rroj3Th0NbC8vGJ47vobK8jQ4XgrwaUGhhloCTpAjzFLFTUS
|
||||||
mO6UEhL6V1i2YZFNkNMg/W8aoMiUgBdqbkxaxblT9L0aNdlFU9+LbWYolURVEadd
|
YdiJN2qBQfABhxD9Owqo98HXDigqb9jhh/LrPYYDhtP6c4J+zz3+gPRiho7T03H3
|
||||||
Qjv0Z1gMA+tsuBbVszwsMfneZ5+B9Q==
|
kZ+YU3Q=
|
||||||
-----END AGE ENCRYPTED FILE-----
|
-----END AGE ENCRYPTED FILE-----
|
||||||
|
|||||||
Reference in New Issue
Block a user