X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;ds=sidebyside;f=nixops%2Fscripts%2Fpull_deployment;h=2f5087553ae98f07700322c7ccbaf1432bb68ed2;hb=dbcba2ea2b7301aaa7e6487c2589b09ef09ba066;hp=796ff9bb2951c99c7370032a1cc0f3b9f1198a8f;hpb=568d4240fa2d4b1f29cc1dd6d943a2da941ef46e;p=perso%2FImmae%2FConfig%2FNix.git

diff --git a/nixops/scripts/pull_deployment b/nixops/scripts/pull_deployment
index 796ff9b..2f50875 100755
--- a/nixops/scripts/pull_deployment
+++ b/nixops/scripts/pull_deployment
@@ -1,31 +1,33 @@
 #!/bin/bash
 
 DeploymentUuid="cef694f3-081d-11e9-b31f-0242ec186adf"
-
 if [ -z "$NIXOPS_CONFIG_PASS_SUBTREE_PATH" ]; then
   echo "Please set NIXOPS_CONFIG_PASS_SUBTREE_PATH to the password-store subtree path"
   exit 1;
 fi
-
 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))/scripts/nix_env
+
 export NIXOPS_STATE="$(dirname $DIR)/state/eldiron.nixops"
 
-if nixops info -d $DeploymentUuid 2>/dev/null >/dev/null; then
+if nixops_custom info -d $DeploymentUuid 2>/dev/null >/dev/null; then
   cat <<EOF
 This will remove your current deployment file and recreate it!
 Continue? [y/N]
 EOF
   read y
   if [ "$y" = "y" -o "$y" = "Y" ]; then
-    nixops delete --force -d $DeploymentUuid
+    nixops_custom delete --force -d $DeploymentUuid
   else
     echo "Aborting"
     exit 1
   fi
 fi
 
-deployment=$(pass show $NIXOPS_CONFIG_PASS_SUBTREE_PATH/NixDeployment)
+deployment=$(pass show $NIXOPS_CONFIG_PASS_SUBTREE_PATH/Nixops/Deployment)
 
-echo "$deployment" | nixops import
+echo "$deployment" | nixops_custom import
 
-nixops modify -d "$DeploymentUuid" "$(dirname $DIR)/eldiron.nix"
+nixops_custom modify -d "$DeploymentUuid" "$(dirname $DIR)/eldiron.nix"