6 files changed, 14 insertions, 94 deletions

diff --git a/nixops/scripts/pull_deployment b/nixops/scripts/pull_deployment
deleted file mode 100755
index 08b9915..0000000
--- a/nixops/scripts/pull_deployment
+++ /dev/null
@@ -1,33 +0,0 @@
-#!/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_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_custom delete --force -d $DeploymentUuid
-  else
-    echo "Aborting"
-    exit 1
-  fi
-fi
-
-deployment=$(pass show $NIXOPS_CONFIG_PASS_SUBTREE_PATH/Nixops/Deployment)
-
-echo "$deployment" | nixops_custom import
-
-nixops_custom modify -d "$DeploymentUuid" "$(dirname $DIR)/default.nix"
diff --git a/nixops/scripts/pull_environment b/nixops/scripts/pull_environment
deleted file mode 100755
index e508a2e..0000000
--- a/nixops/scripts/pull_environment
+++ /dev/null
@@ -1,13 +0,0 @@
-#!/bin/bash
-
-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
-
-if [ -z "$NIXOPS_CONFIG_PASS_SUBTREE_REMOTE" ]; then
-  echo "Please set NIXOPS_CONFIG_PASS_SUBTREE_REMOTE to the password-store subtree remote name"
-  exit 1;
-fi
-
-pass git subtree pull --prefix=$NIXOPS_CONFIG_PASS_SUBTREE_PATH $NIXOPS_CONFIG_PASS_SUBTREE_REMOTE master
diff --git a/nixops/scripts/push_deployment b/nixops/scripts/push_deployment
deleted file mode 100755
index f2d25f9..0000000
--- a/nixops/scripts/push_deployment
+++ /dev/null
@@ -1,13 +0,0 @@
-#!/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
-
-nixops_custom export | pass insert -m $NIXOPS_CONFIG_PASS_SUBTREE_PATH/Nixops/Deployment
diff --git a/nixops/scripts/push_environment b/nixops/scripts/push_environment
deleted file mode 100755
index 8b59240..0000000
--- a/nixops/scripts/push_environment
+++ /dev/null
@@ -1,13 +0,0 @@
-#!/bin/bash
-
-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
-
-if [ -z "$NIXOPS_CONFIG_PASS_SUBTREE_REMOTE" ]; then
-  echo "Please set NIXOPS_CONFIG_PASS_SUBTREE_REMOTE to the password-store subtree remote name"
-  exit 1;
-fi
-
-pass git subtree push --prefix=$NIXOPS_CONFIG_PASS_SUBTREE_PATH $NIXOPS_CONFIG_PASS_SUBTREE_REMOTE master
diff --git a/nixops/scripts/setup b/nixops/scripts/setup
index 793b7c3..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
@@ -97,29 +97,21 @@ if nix show-config --json | jq -e '.sandbox.value == "true"' >/dev/null; then
   read y
 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
-
-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
+    make -C $MAKEFILE_DIR pull_deployment
   else
     echo "Aborting"
     exit 1
   fi
 fi
 
-nixops_custom modify "$(dirname $DIR)/default.nix"
-
 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
diff --git a/nixops/scripts/nixops_wrap b/nixops/scripts/with_env
index 28aa917..a442ced 100755
--- a/nixops/scripts/nixops_wrap
+++ b/nixops/scripts/with_env
@@ -1,21 +1,21 @@
 #!/bin/bash
 
-DeploymentUuid="cef694f3-081d-11e9-b31f-0242ec186adf"
+if [ -z "$NIXOPS" ]; then
+  echo "Please set NIXOPS to the nixops command"
+  exit 1;
+fi
+
 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
 
 TEMP=$(mktemp -d /tmp/XXXXXX-nixops-files)
 chmod go-rwx $TEMP
 
 finish() {
   rm -rf "$TEMP"
-  nixops_custom set-args --unset privateFiles
+  $NIXOPS set-args --unset privateFiles
 }
 
 trap finish EXIT
@@ -26,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_custom set-args --argstr privateFiles "$TEMP"
+$NIXOPS set-args --argstr privateFiles "$TEMP"
 
-nixops_custom "$@"
+"$@"