From 78e25e2ac542eceb33aa0d292397d5236dbb9df8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Isma=C3=ABl=20Bouya?= Date: Thu, 25 Apr 2019 01:34:35 +0200 Subject: Fix nixops: allow keyFile to be a string in deployments --- nixops/scripts/nixops_wrap | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) (limited to 'nixops/scripts') diff --git a/nixops/scripts/nixops_wrap b/nixops/scripts/nixops_wrap index 3a894f9..e4f5dc5 100755 --- a/nixops/scripts/nixops_wrap +++ b/nixops/scripts/nixops_wrap @@ -9,14 +9,16 @@ fi TEMP=$(mktemp -d /tmp/XXXXXX-nixops-files) chmod go-rwx $TEMP +DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd )" +nixops="$(nix-build --no-out-link -A nixops "$(dirname $(dirname $DIR))")/bin/nixops" + finish() { rm -rf "$TEMP" - nixops set-args --unset privateFiles + $nixops set-args --unset privateFiles } trap finish EXIT -DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd )" export NIXOPS_STATE="$(dirname $DIR)/state/eldiron.nixops" export NIXOPS_DEPLOYMENT="$DeploymentUuid" @@ -26,9 +28,9 @@ files=$(pass ls $NIXOPS_CONFIG_PASS_SUBTREE_PATH/Nixops/files | sed -e '1d' -e ' for file in $files; do pass show "$NIXOPS_CONFIG_PASS_SUBTREE_PATH/Nixops/files/$file" > $TEMP/$file done -nixops set-args --argstr privateFiles "$TEMP" +$nixops set-args --argstr privateFiles "$TEMP" source $(dirname $(dirname $DIR))/nix_path_env # __noChroot: ssh-config-file requires relaxed export NIX_PATH="ssh-config-file=$(dirname $DIR)/ssh/config:$NIX_PATH" -nixops "$@" +$nixops "$@" -- cgit v1.2.3