magic_rb/dotfiles
1
0
Fork 0
mirror of https://git.sr.ht/~magic_rb/dotfiles synced 2024-11-22 08:04:20 +01:00
Code Issues Packages Projects Releases Wiki Activity

Allow for arbitrary arguments to nomadJob and terraformModule

Browse source 
Signed-off-by: Magic_RB <magic_rb@redalder.org>
This commit is contained in:
Magic_RB 2023-06-29 18:58:27 +02:00
parent 0d4698ab78
commit 158ffab7c5
No known key found for this signature in database
GPG key ID: 08D5287CC5DDCA0E
2 changed files with 6 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
terranix/lib/nomad_job.nix
View file

@ -1,11 +1,12 @@
{}: {}:
{ jobspec { jobspec
, vars ? {} , vars ? {}
}: , ...
}@args:
{ {
jobspec = "\${file(\"${jobspec}\")}"; jobspec = "\${file(\"${jobspec}\")}";
hcl2 = { hcl2 = {
enabled = true; enabled = true;
inherit vars; inherit vars;
}; };
} } // builtins.removeAttrs args [ "name" "source" ]

5
terranix/lib/terraform-module.nix
View file

@ -5,7 +5,8 @@
{ {
name name
, source , source
}: , ...
}@args:
{ {
source = source =
let let
@ -24,4 +25,4 @@
mkdir -p $out/ mkdir -p $out/
ln -s ${module} $out/main.tf.json ln -s ${module} $out/main.tf.json
''; '';
} } // builtins.removeAttrs args [ "name" "source" ]