Monorepo for Tangled tangled.org
6

Configure Feed

Select the types of activity you want to include in your feed.

nix: change spindle cache option to nixCache, which is clearer

Signed-off-by: dawn <dawn@tangled.org>

author
dawn
date (Jun 19, 2026, 7:46 AM +0300) commit a9548715 parent 94fb07d3 change-id kmtnkxlz
+27 -30
+22 -22
nix/modules/spindle.nix
··· 258 258 }; 259 259 }; 260 260 }; 261 - }; 262 261 263 - cache = { 264 - readUrls = mkOption { 265 - type = types.listOf types.str; 266 - default = []; 267 - example = ["http://ncps.internal:8501"]; 268 - description = "Nix binary cache URLs the Spindle guest should read from."; 269 - }; 262 + nixCache = { 263 + readUrls = mkOption { 264 + type = types.listOf types.str; 265 + default = []; 266 + example = ["http://ncps.internal:8501" "ssh-ng://user@my-awesome-cache"]; 267 + description = "Nix binary cache URLs the Spindle guest should read from."; 268 + }; 270 269 271 - trustedPublicKeys = mkOption { 272 - type = types.listOf types.str; 273 - default = []; 274 - example = ["ncps.internal-1:AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA="]; 275 - description = "Public keys trusted for the configured Nix binary caches."; 276 - }; 270 + trustedPublicKeys = mkOption { 271 + type = types.listOf types.str; 272 + default = []; 273 + example = ["internal-1:AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA="]; 274 + description = "Public keys trusted for the configured Nix binary caches."; 275 + }; 277 276 278 - uploadUrl = mkOption { 279 - type = types.str; 280 - default = ""; 281 - example = "http://ncps.internal:8501/upload"; 282 - description = "Optional cache upload URL used by live cache import paths."; 277 + uploadUrl = mkOption { 278 + type = types.str; 279 + default = ""; 280 + example = "local"; 281 + description = "Optional cache upload URL used by live cache import paths."; 282 + }; 283 283 }; 284 284 }; 285 285 ··· 376 376 "SPINDLE_MICROVM_PIPELINES_CGROUP_PIDS_MAX=${toString cfg.pipelines.microvm.cgroup.pidsMax}" 377 377 "SPINDLE_MICROVM_PIPELINES_CGROUP_SWAP_MAX_MIB=${toString cfg.pipelines.microvm.cgroup.swapMaxMiB}" 378 378 "SPINDLE_MICROVM_PIPELINES_CGROUP_SUPERVISOR_MEMORY_MIN_MIB=${toString cfg.pipelines.microvm.cgroup.supervisorMinMiB}" 379 - "SPINDLE_NIX_CACHE_READ_URLS=${concatStringsSep "," cfg.cache.readUrls}" 380 - "SPINDLE_NIX_CACHE_TRUSTED_PUBLIC_KEYS=${concatStringsSep "," cfg.cache.trustedPublicKeys}" 381 - "SPINDLE_NIX_CACHE_UPLOAD_URL=${cfg.cache.uploadUrl}" 379 + "SPINDLE_NIX_CACHE_READ_URLS=${concatStringsSep "," cfg.pipelines.nixCache.readUrls}" 380 + "SPINDLE_NIX_CACHE_TRUSTED_PUBLIC_KEYS=${concatStringsSep "," cfg.pipelines.nixCache.trustedPublicKeys}" 381 + "SPINDLE_NIX_CACHE_UPLOAD_URL=${cfg.pipelines.nixCache.uploadUrl}" 382 382 "SPINDLE_S3_LOG_BUCKET=${cfg.pipelines.logBucket}" 383 383 ]; 384 384 ExecStart = "${cfg.package}/bin/spindle";
+5 -8
nix/vm.nix
··· 164 164 165 165 pipelines = { 166 166 logBucket = envVarOr "SPINDLE_S3_LOG_BUCKET" ""; 167 - microvm = { 168 - enableKVM = nestedVirt; 167 + microvm.enableKVM = nestedVirt; 168 + nixCache = { 169 + readUrls = ["http://127.0.0.1:8501"]; 170 + trustedPublicKeys = ["cache.local:F7YqpMzuBdILYd/v+wMZN2YKxCzliXQyFmeezOxw7rU="]; 171 + uploadUrl = "http://127.0.0.1:8501/upload"; 169 172 }; 170 - }; 171 - 172 - cache = { 173 - readUrls = ["http://127.0.0.1:8501"]; 174 - trustedPublicKeys = ["cache.local:F7YqpMzuBdILYd/v+wMZN2YKxCzliXQyFmeezOxw7rU="]; 175 - uploadUrl = "http://127.0.0.1:8501/upload"; 176 173 }; 177 174 }; 178 175 services.ncps = {