diff options
Diffstat (limited to 'nixops/scripts/setup')
-rwxr-xr-x | nixops/scripts/setup | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/nixops/scripts/setup b/nixops/scripts/setup index 72b19c0..cc03482 100755 --- a/nixops/scripts/setup +++ b/nixops/scripts/setup | |||
@@ -94,7 +94,7 @@ if nix show-config --json | jq -e '.sandbox.value == "true"' >/dev/null; then | |||
94 | fi | 94 | 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))/scripts/nix_env |
98 | export NIXOPS_STATE="$(dirname $DIR)/state/eldiron.nixops" | 98 | export NIXOPS_STATE="$(dirname $DIR)/state/eldiron.nixops" |
99 | export NIXOPS_DEPLOYMENT="$DeploymentUuid" | 99 | export NIXOPS_DEPLOYMENT="$DeploymentUuid" |
100 | 100 | ||
@@ -107,14 +107,14 @@ if ! nixops_custom info 2>/dev/null >/dev/null; then | |||
107 | if [ "$y" = "y" -o "$y" = "Y" ]; then | 107 | if [ "$y" = "y" -o "$y" = "Y" ]; then |
108 | deployment=$(pass show $NIXOPS_CONFIG_PASS_SUBTREE_PATH/Nixops/Deployment) | 108 | deployment=$(pass show $NIXOPS_CONFIG_PASS_SUBTREE_PATH/Nixops/Deployment) |
109 | echo "$deployment" | nixops_custom import | 109 | echo "$deployment" | nixops_custom import |
110 | |||
111 | nixops_custom modify "$(dirname $DIR)/eldiron.nix" | ||
112 | else | 110 | else |
113 | echo "Aborting" | 111 | echo "Aborting" |
114 | exit 1 | 112 | exit 1 |
115 | fi | 113 | fi |
116 | fi | 114 | fi |
117 | 115 | ||
116 | nixops_custom modify "$(dirname $DIR)/default.nix" | ||
117 | |||
118 | cat <<-EOF | 118 | cat <<-EOF |
119 | All set up. | 119 | All set up. |
120 | Please make sure you’re using scripts/nixops_wrap when deploying | 120 | Please make sure you’re using scripts/nixops_wrap when deploying |