Fix pub flake to use Cachix cache (#1202)

Co-authored-by: Claude Opus 4.6 (1M context) <noreply@anthropic.com>

Author: kixelated

cdn/common/monitor.sh

@@ -101,14 +101,14 @@ check_health() {
 		if $ok && [ "$status" = "200" ]; then
 			if [[ "${HEALTH_STATE[$node]}" == "failing" ]]; then
 				HEALTH_STATE[$node]="ok"
-				local msg="Health recovered: ${node}.${HEALTH_DOMAIN}"
+				local msg="Health recovered: ${node}.${HEALTH_DOMAIN} (from ${HOSTNAME})"
 				echo "$msg"
 				send_webhook "$msg"
 			fi
 		else
 			if [[ "${HEALTH_STATE[$node]}" != "failing" ]]; then
 				HEALTH_STATE[$node]="failing"
-				local msg="Health check FAILED: ${node}.${HEALTH_DOMAIN} (${status:-timeout})"
+				local msg="Health check FAILED: ${node}.${HEALTH_DOMAIN} (${status:-timeout}) (from ${HOSTNAME})"
 				echo "$msg"
 				send_webhook "$msg"
 			else

cdn/pub/flake.lock

@@ -1,26 +1,24 @@
 {
   description = "MoQ publisher dependencies";
 
+  nixConfig = {
+    extra-substituters = [ "https://kixelated.cachix.org" ];
+    extra-trusted-public-keys = [ "kixelated.cachix.org-1:CmFcV0lyM6KuVM2m9mih0q4SrAa0XyCsiM7GHrz3KKk=" ];
+  };
+
   inputs = {
-    nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable";
-    moq = {
-      # Pin to a release tag via: just pin
-      url = "github:moq-dev/moq";
-      inputs.nixpkgs.follows = "nixpkgs";
-    };
+    # Pin to a release tag via: just pin
+    moq.url = "github:moq-dev/moq";
+    # Don't override nixpkgs — use moq's pin so Cachix cache hits
   };
 
   outputs =
-    {
-      nixpkgs,
-      moq,
-      ...
-    }:
+    { moq, ... }:
     {
       packages.x86_64-linux =
         let
           system = "x86_64-linux";
-          pkgs = nixpkgs.legacyPackages.${system};
+          pkgs = moq.inputs.nixpkgs.legacyPackages.${system};
         in
         {
           default = pkgs.symlinkJoin {

cdn/pub/flake.nix

@@ -15,8 +15,7 @@ pin tag="":
 		exit 1
 	fi
 	echo "Pinning to $TAG..."
-	nix flake update
-	nix flake lock --override-input moq "github:moq-dev/moq/$TAG"
+	nix flake lock --override-input moq "github:moq-dev/moq/$TAG" --update-input moq
 
 # Get the hostname for the publisher
 host:
@@ -72,6 +71,12 @@ ssh:
 	HOST=$(just host)
 	ssh root@$HOST
 
+restart:
+	#!/usr/bin/env bash
+	HOST=$(just host)
+	echo "=== $HOST ==="
+	ssh root@$HOST "systemctl restart demo-bbb --no-pager"
+
 # View logs from publisher
 logs:
 	#!/usr/bin/env bash

cdn/pub/justfile

@@ -89,6 +89,11 @@ logs node:
 	#!/usr/bin/env bash
 	ssh root@$(just host {{node}}) "journalctl -u moq-relay -f"
 
+# Restart
+restart node:
+	#!/usr/bin/env bash
+	ssh root@$(just host {{node}}) "systemctl restart moq-relay --no-pager"
+
 # Profile moq-relay on a node using perf (built via nix)
 perf node *args:
 	#!/usr/bin/env bash

cdn/relay/flake.lock

@@ -55,7 +55,7 @@ start rom url='http://localhost:4443/anon':
 
 # Host the web server
 web url='http://localhost:4443/anon':
-	VITE_RELAY_URL="{{url}}" bun run --filter @moq/boy dev --open
+	VITE_RELAY_URL="{{url}}" bun vite --open
 
 # --- rom.moq.dev (R2 hosting) ---
 

cdn/relay/justfile

@@ -15,7 +15,7 @@ cluster:
 		"just wait && just leaf1" \
 		"just wait && just pub bbb http://localhost:4444/demo?jwt=$(cat demo-cli.jwt)" \
 		"just wait && just pub tos http://localhost:4443/demo?jwt=$(cat demo-cli.jwt)" \
-		"just wait && env VITE_RELAY_URL=http://localhost:4445/demo?jwt=$(cat demo-web.jwt) bun run --filter @moq/demo dev"
+		"just wait && VITE_RELAY_URL=http://localhost:4445/demo?jwt=$(cat demo-web.jwt) bun --cwd ../web vite"
 
 # Run a localhost root server, accepting connections from leaf nodes.
 root: auth-key

dev/boy/justfile

@@ -6,4 +6,4 @@ default:
 
 # Run the web server targeting the specified relay.
 serve url='http://localhost:4443/anon':
-	VITE_RELAY_URL="{{url}}" bun run --filter @moq/demo dev
+	VITE_RELAY_URL="{{url}}" bun vite

dev/relay/justfile

@@ -4,6 +4,7 @@
 
 
 mod dev
+mod cdn
 
 # Shortcuts to avoid `dev::` prefix.
 mod boy 'dev/boy'