X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=nixops%2Fscripts%2Fnixops_wrap;fp=nixops%2Fscripts%2Fnixops_wrap;h=e75fa2fac737c1d52f6feba6e05289e3aaa523d7;hb=db4f87d640a090c4b469595737503f4189923c45;hp=9cf33886183f8e8c78c05d4c8366908b8df5d029;hpb=c58dcd70150d63e01dfe01adbb38244598e6a881;p=perso%2FImmae%2FConfig%2FNix.git diff --git a/nixops/scripts/nixops_wrap b/nixops/scripts/nixops_wrap index 9cf3388..e75fa2f 100755 --- a/nixops/scripts/nixops_wrap +++ b/nixops/scripts/nixops_wrap @@ -9,14 +9,13 @@ DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd )" export NIXOPS_STATE="$(dirname $DIR)/state/eldiron.nixops" export NIXOPS_DEPLOYMENT="$DeploymentUuid" source $(dirname $(dirname $DIR))/nix_path_env -nixops="$(nix-build --no-out-link "$(dirname $DIR)/custom_nixops.nix")/bin/nixops" TEMP=$(mktemp -d /tmp/XXXXXX-nixops-files) chmod go-rwx $TEMP finish() { rm -rf "$TEMP" - $nixops set-args --unset privateFiles + nixops_custom set-args --unset privateFiles } trap finish EXIT @@ -27,6 +26,6 @@ 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_custom set-args --argstr privateFiles "$TEMP" -$nixops "$@" +nixops_custom "$@"