better openwrt sub lan control

This commit is contained in:
ari committed 2026-08-26 16:31:48 -04:00
1 parent 07d5bffef2
commit e3866d75a9
15 files changed
+384 -573

No files matched your search

+91 -17
View File
@@ -7,6 +7,54 @@ let
src = ./generator;
cargoLock.lockFile = ./generator/Cargo.lock;
};
# Remote apply script: backs up the configs it overrides, applies the new
# firewall/dnsmasq/ethers, validates, and auto-restores on failure.
# Run on the router as: TS=<timestamp> bash skyg-apply.sh
# Expects the new files staged at /tmp/skyg_firewall.batch,
# /tmp/dnsmasq.new.conf and /tmp/ethers.new.
applyScript = pkgs.writeText {
name = "skyg-apply.sh";
text = ''
set -euo pipefail
BK=/etc/skyg-backups
mkdir -p "$BK"
cp /etc/config/firewall "$BK/firewall.$TS"
cp /etc/dnsmasq.conf "$BK/dnsmasq.conf.$TS"
cp /etc/ethers "$BK/ethers.$TS" 2>/dev/null || true
# --- Firewall: replace the skyg-managed rules ---
for ref in $(uci show firewall | awk -F. '/\.name=.skyg_/{print $1"."$2}'); do
uci -q del "$ref" || true
done
if ! uci batch < /tmp/skyg_firewall.batch; then
echo 'FIREWALL: uci batch failed, restoring'
cp "$BK/firewall.$TS" /etc/config/firewall
exit 1
fi
if ! uci commit firewall; then
echo 'FIREWALL: uci commit failed, restoring'
cp "$BK/firewall.$TS" /etc/config/firewall
exit 1
fi
/etc/init.d/firewall reload
# --- dnsmasq ---
cp /tmp/dnsmasq.new.conf /etc/dnsmasq.conf
if dnsmasq --test; then
/etc/init.d/dnsmasq restart
else
echo 'dnsmasq config invalid, restoring'
cp "$BK/dnsmasq.conf.$TS" /etc/dnsmasq.conf
exit 1
fi
# --- ethers ---
cp /tmp/ethers.new /etc/ethers
echo 'Done'
'';
};
in
config:
@@ -23,10 +71,16 @@ let
DNSMASQ=$(echo "$CONFIG" | ${generator}/bin/openwrt-gen dnsmasq)
ETHERS=$(echo "$CONFIG" | ${generator}/bin/openwrt-gen ethers)
FIREWALL=$(echo "$CONFIG" | ${generator}/bin/openwrt-gen firewall)
echo "Fetching current config from $SERVER..."
CURRENT_DNSMASQ=$(ssh "$SERVER" 'cat /etc/dnsmasq.conf' 2>/dev/null || echo "")
CURRENT_ETHERS=$(ssh "$SERVER" 'cat /etc/ethers' 2>/dev/null || echo "")
CURRENT_FIREWALL_ALL=$(ssh "$SERVER" 'uci export firewall' 2>/dev/null || echo "")
# Keep only the skyg-managed rule blocks (for the diff)
CURRENT_FIREWALL=$(echo "$CURRENT_FIREWALL_ALL" | awk '/^config /{if(have && block ~ /skyg_/) print block; block=$0; have=1; next}{if(have) block=block ORS $0}END{if(have && block ~ /skyg_/) print block}')
# Drop the header comment from the generated firewall for a clean diff
NEW_FIREWALL=$(echo "$FIREWALL" | tail -n +2)
echo ""
echo "$DNSMASQ"
@@ -34,8 +88,6 @@ let
comm -3 <(echo "$CURRENT_DNSMASQ" | sort) <(echo "$DNSMASQ" | sort) | awk '{if ($0 ~ /^</) print "\033[31m"$0"\033[0m"; else if ($0 ~ /^>/) print "\033[32m"$0"\033[0m"; else print}'
echo "=== dnsmasq.conf diff [END] ==="
echo ""
read -p "Looks good? [y/N] " -n 1 -r < /dev/tty; echo
[[ $REPLY =~ ^[Yy]$ ]] || exit 1
echo "$ETHERS"
echo "=== ethers diff [START] ==="
@@ -43,26 +95,48 @@ let
echo "=== ethers diff [END] ==="
echo ""
echo "$NEW_FIREWALL"
echo "=== firewall (skyg rules) diff [START] ==="
comm -3 <(echo "$CURRENT_FIREWALL" | sort) <(echo "$NEW_FIREWALL" | sort) | awk '{if ($0 ~ /^</) print "\033[31m"$0"\033[0m"; else if ($0 ~ /^>/) print "\033[32m"$0"\033[0m"; else print}'
echo "=== firewall (skyg rules) diff [END] ==="
echo ""
read -p "Deploy to $SERVER? [y/N] " -n 1 -r < /dev/tty; echo
[[ $REPLY =~ ^[Yy]$ ]] || exit 1
echo "$DNSMASQ" | ssh "$SERVER" 'cat > /tmp/dnsmasq.new.conf'
echo "$ETHERS" | ssh "$SERVER" 'cat > /etc/ethers'
TS=$(date +%Y%m%d-%H%M%S)
ssh "$SERVER" '
cp /etc/dnsmasq.conf /tmp/dnsmasq.old.conf
cp /tmp/dnsmasq.new.conf /etc/dnsmasq.conf
if dnsmasq --test; then
/etc/init.d/dnsmasq restart
echo "Done"
else
echo "Config invalid, reverting..."
cp /tmp/dnsmasq.old.conf /etc/dnsmasq.conf
exit 1
fi
'
# Stage the apply script and the new config files on the router
ssh "$SERVER" 'cat > /tmp/skyg_apply.sh' < "${applyScript}"
echo "$DNSMASQ" | ssh "$SERVER" 'cat > /tmp/dnsmasq.new.conf'
echo "$ETHERS" | ssh "$SERVER" 'cat > /tmp/ethers.new'
echo "$FIREWALL" | ssh "$SERVER" 'cat > /tmp/skyg_firewall.batch'
# Back up, apply, validate, auto-restore on failure
ssh "$SERVER" "TS=$TS bash /tmp/skyg_apply.sh"
'';
# Dry-run: render the configs locally and write them to .tmp/openwrt-<router>/
# for review. No SSH, no uci, no router changes. Run from the repo root.
# The router name is taken from $SKYG_ROUTER (default glmain).
dryRunScript = pkgs.writeShellScriptBin "openwrt-dry-run" ''
set -euo pipefail
ROUTER="$'{SKYG_ROUTER:-glmain}"
OUTDIR=".tmp/openwrt-$ROUTER"
mkdir -p "$OUTDIR"
CONFIG=$(cat)
echo "$CONFIG" | ${generator}/bin/openwrt-gen dnsmasq > "$OUTDIR/dnsmasq.conf"
echo "$CONFIG" | ${generator}/bin/openwrt-gen ethers > "$OUTDIR/ethers"
echo "$CONFIG" | ${generator}/bin/openwrt-gen firewall > "$OUTDIR/firewall.batch"
echo "Dry-run configs written to $OUTDIR (no router changes made):"
echo " $OUTDIR/dnsmasq.conf"
echo " $OUTDIR/ethers"
echo " $OUTDIR/firewall.batch"
'';
in
{
inherit deployScript;
inherit deployScript dryRunScript;
}