X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=nixops%2Fscripts%2Fsetup;h=3b364ac74fa48196d897fef5da72fcb970f59fe7;hb=53fa9f9e7d87835d6137a029fe80b3195e635797;hp=72b19c073d00207056a2e2b7e5cc782913012b49;hpb=db4f87d640a090c4b469595737503f4189923c45;p=perso%2FImmae%2FConfig%2FNix.git

diff --git a/nixops/scripts/setup b/nixops/scripts/setup
index 72b19c0..3b364ac 100755
--- a/nixops/scripts/setup
+++ b/nixops/scripts/setup
@@ -3,7 +3,7 @@
 set -euo pipefail
 
 RemoteRepo="gitolite@git.immae.eu:perso/Immae/Prive/Password_store/Sites"
-DeploymentUuid="cef694f3-081d-11e9-b31f-0242ec186adf"
+MAKEFILE_DIR="$( cd "$( dirname $( dirname "${BASH_SOURCE[0]}" ))" >/dev/null 2>&1 && pwd )"
 
 if ! which nix 2>/dev/null >/dev/null; then
   cat <<-EOF
@@ -52,8 +52,8 @@ if ! pass $NIXOPS_CONFIG_PASS_SUBTREE_PATH > /dev/null 2>/dev/null; then
   fi
 fi
 
-# Repull it before using it, just in case
-pass git subtree pull --prefix=$NIXOPS_CONFIG_PASS_SUBTREE_PATH $NIXOPS_CONFIG_PASS_SUBTREE_REMOTE master
+# Repull it before adding keys, just in case
+make -C $MAKEFILE_DIR pull_environment
 
 gpg_keys=$(pass ls $NIXOPS_CONFIG_PASS_SUBTREE_PATH/Nixops/GPGKeys | sed -e "1d" | cut -d" " -f2)
 for key in $gpg_keys; do
@@ -82,33 +82,29 @@ done
 
 if nix show-config --json | jq -e '.sandbox.value == "true"' >/dev/null; then
   cat <<-EOF
-	There are some impure derivations in the repo currently (grep __noChroot), please put
+	There used to be some impure derivations (grep __noChroot), you may need
 	  sandbox = "relaxed"
 	in /etc/nix/nix.conf
 	you may also want to add
 	  keep-outputs = true
 	  keep-derivations = true
 	to prevent garbage collector from deleting build dependencies (they take a lot of time to build)
+        and
+	  allow-import-from-derivation = false
+	as an attempt to avoid having build-time derivations (doesn’t work for all packages)
+	press key to continue
 	EOF
-  exit 1
+  read y
 fi
 
-DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd )"
-source $(dirname $(dirname $DIR))/nix_path_env
-export NIXOPS_STATE="$(dirname $DIR)/state/eldiron.nixops"
-export NIXOPS_DEPLOYMENT="$DeploymentUuid"
-
-if ! nixops_custom info 2>/dev/null >/dev/null; then
+if ! make -C $MAKEFILE_DIR deployment_is_set 2>/dev/null >/dev/null; then
   cat <<-EOF
 	Importing deployment file into nixops:
 	Continue? [y/N]
 	EOF
   read y
   if [ "$y" = "y" -o "$y" = "Y" ]; then
-    deployment=$(pass show $NIXOPS_CONFIG_PASS_SUBTREE_PATH/Nixops/Deployment)
-    echo "$deployment" | nixops_custom import
-
-    nixops_custom modify "$(dirname $DIR)/eldiron.nix"
+    make -C $MAKEFILE_DIR pull_deployment
   else
     echo "Aborting"
     exit 1
@@ -117,5 +113,5 @@ fi
 
 cat <<-EOF
 	All set up.
-	Please make sure you’re using scripts/nixops_wrap when deploying
+	Please make sure you’re using make commands when deploying
 	EOF