From d65a5340226abcf512e8a6db01ad8e56db64a6bd Mon Sep 17 00:00:00 2001
From: tv <tv@shackspace.de>
Date: Wed, 20 May 2015 16:10:42 +0200
Subject: prelude: make <secrets> available

---
 lib/prelude.sh | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

(limited to 'lib')

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 \
-- 
cgit v1.2.3