summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authortv <tv@shackspace.de>2015-05-20 16:10:42 +0200
committertv <tv@shackspace.de>2015-05-20 16:10:42 +0200
commitd65a5340226abcf512e8a6db01ad8e56db64a6bd (patch)
tree3ce5851bbde8f91569a1df5cfb91498577d40b44
parent36738fe605864a1cbcdd1fc9579ab6a3b9d8bc10 (diff)
prelude: make <secrets> available
-rw-r--r--lib/prelude.sh7
1 files changed, 5 insertions, 2 deletions
diff --git a/lib/prelude.sh b/lib/prelude.sh
index cd85b1397..2adfb5651 100644
--- a/lib/prelude.sh
+++ b/lib/prelude.sh
@@ -53,8 +53,10 @@ deploy() {(
| rsync -f '. -' -zvrlptD --delete-excluded ./ "$target":/etc/nixos/
clone_or_update "$target" "$nixpkgs_dir" "$git_url" "$git_rev"
- ssh "$target" nixos-rebuild switch -I nixos-config=/etc/nixos/"$main" -I nixpkgs="$nixpkgs_dir"
-
+ ssh "$target" nixos-rebuild switch \
+ -I nixos-config=/etc/nixos/"$main" \
+ -I nixpkgs="$nixpkgs_dir" \
+ -I secrets=/etc/nixos/secrets \
)}
# rsync_filter : nixos-config -> rsync-filter
@@ -98,6 +100,7 @@ list_module_imports() {
set -- "./$1"
fi
imports=$(nix-instantiate \
+ -I secrets=secrets \
--strict \
--json \
--eval \