From 449e73fdbac7c01e7218cbbe2ac292a0752e077a Mon Sep 17 00:00:00 2001 From: Magic_RB Date: Mon, 10 Jul 2023 23:37:54 +0200 Subject: [PATCH] Update ingressToothpick to new Nix integration Signed-off-by: Magic_RB --- terranix/containers/ingress-toothpick/default.nix | 3 ++- terranix/containers/ingress-toothpick/job.hcl | 4 ++++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/terranix/containers/ingress-toothpick/default.nix b/terranix/containers/ingress-toothpick/default.nix index fe6e17f..26deafd 100644 --- a/terranix/containers/ingress-toothpick/default.nix +++ b/terranix/containers/ingress-toothpick/default.nix @@ -1,4 +1,4 @@ -{ elib, secret, vars, ... }: +{ elib, secret, vars, config', ... }: let inherit (elib) nfsVolume @@ -18,6 +18,7 @@ in vars = { flake_ref = "${vars.flake_host}?rev=${vars.flake_rev}&ref=${vars.flake_ref}"; flake_sha = vars.flake_sha; + store_path = config'.flake.nixngConfigurations.ingressToothpick.config.system.build.toplevel; upstreams = "\${file(\"${./upstreams.conf}\")}"; }; }; diff --git a/terranix/containers/ingress-toothpick/job.hcl b/terranix/containers/ingress-toothpick/job.hcl index 13f3723..27f0e92 100644 --- a/terranix/containers/ingress-toothpick/job.hcl +++ b/terranix/containers/ingress-toothpick/job.hcl @@ -6,6 +6,10 @@ variable "flake_sha" { type = string } +variable "store_path" { + type = string +} + variable "upstreams" { type = string }