diff options
Diffstat (limited to 'nixops/scripts/setup')
-rwxr-xr-x | nixops/scripts/setup | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/nixops/scripts/setup b/nixops/scripts/setup index 58dbf55..72b19c0 100755 --- a/nixops/scripts/setup +++ b/nixops/scripts/setup | |||
@@ -95,11 +95,10 @@ fi | |||
95 | 95 | ||
96 | DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd )" | 96 | DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd )" |
97 | source $(dirname $(dirname $DIR))/nix_path_env | 97 | source $(dirname $(dirname $DIR))/nix_path_env |
98 | nixops="$(nix-build --no-out-link "$(dirname $DIR)/custom_nixops.nix")/bin/nixops" | ||
99 | export NIXOPS_STATE="$(dirname $DIR)/state/eldiron.nixops" | 98 | export NIXOPS_STATE="$(dirname $DIR)/state/eldiron.nixops" |
100 | export NIXOPS_DEPLOYMENT="$DeploymentUuid" | 99 | export NIXOPS_DEPLOYMENT="$DeploymentUuid" |
101 | 100 | ||
102 | if ! $nixops info 2>/dev/null >/dev/null; then | 101 | if ! nixops_custom info 2>/dev/null >/dev/null; then |
103 | cat <<-EOF | 102 | cat <<-EOF |
104 | Importing deployment file into nixops: | 103 | Importing deployment file into nixops: |
105 | Continue? [y/N] | 104 | Continue? [y/N] |
@@ -107,9 +106,9 @@ if ! $nixops info 2>/dev/null >/dev/null; then | |||
107 | read y | 106 | read y |
108 | if [ "$y" = "y" -o "$y" = "Y" ]; then | 107 | if [ "$y" = "y" -o "$y" = "Y" ]; then |
109 | deployment=$(pass show $NIXOPS_CONFIG_PASS_SUBTREE_PATH/Nixops/Deployment) | 108 | deployment=$(pass show $NIXOPS_CONFIG_PASS_SUBTREE_PATH/Nixops/Deployment) |
110 | echo "$deployment" | $nixops import | 109 | echo "$deployment" | nixops_custom import |
111 | 110 | ||
112 | $nixops modify "$(dirname $DIR)/eldiron.nix" | 111 | nixops_custom modify "$(dirname $DIR)/eldiron.nix" |
113 | else | 112 | else |
114 | echo "Aborting" | 113 | echo "Aborting" |
115 | exit 1 | 114 | exit 1 |