X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=nixops%2Fscripts%2Fsetup;h=dce8332f7284308b39e01ed65732f3d8ecf38b72;hb=d5d97b8b57457989ff3a0fa38229a98482d33f65;hp=1586265d48faae553f7122b81a79e2833f266120;hpb=fdf6f74d3221e3dad853898f296149baea0aa476;p=perso%2FImmae%2FConfig%2FNix.git

diff --git a/nixops/scripts/setup b/nixops/scripts/setup
index 1586265..dce8332 100755
--- a/nixops/scripts/setup
+++ b/nixops/scripts/setup
@@ -80,47 +80,6 @@ for key in $gpg_keys; do
   fi
 done
 
-nix_group=$(stat -c %G /nix/store)
-if [ "$nix_group" = "nixbld" ]; then
-  nix_user="nixbld1"
-else
-  nix_user="$(stat -c %U /nix/store)"
-fi
-
-if [ ! -f /etc/ssh/ssh_rsa_key_nixops ]; then
-  cat <<-EOF
-	The key to access private git repositories (websites hosted by the
-	server) needs to be accessible to nix builders. It will be put in
-	/etc/ssh/ssh_rsa_key_nixops (sudo right is needed for that)
-	> pass show $NIXOPS_CONFIG_PASS_SUBTREE_PATH/Nixops/SshKey | sudo tee /etc/ssh/ssh_rsa_key_nixops > /dev/null
-	> pass show $NIXOPS_CONFIG_PASS_SUBTREE_PATH/Nixops/SshKey.pub | sudo tee /etc/ssh/ssh_rsa_key_nixops.pub > /dev/null
-	> sudo chmod u=r,go-rwx /etc/ssh/ssh_rsa_key_nixops
-	> sudo chown $nix_user:$nix_group /etc/ssh/ssh_rsa_key_nixops /etc/ssh/ssh_rsa_key_nixops.pub
-	Continue? [y/N]
-	EOF
-  read y
-  if [ "$y" = "y" -o "$y" = "Y" ]; then
-    if ! id -u $nix_user 2>/dev/null >/dev/null; then
-      echo "User $nix_user seems inexistant, did you install nix?"
-      exit 1
-    fi
-    mask=$(umask)
-    umask 0777
-    # Don’t forward it directly to tee, it would break ncurse pinentry
-    key=$(pass show $NIXOPS_CONFIG_PASS_SUBTREE_PATH/Nixops/SshKey)
-    echo "$key" | sudo tee /etc/ssh/ssh_rsa_key_nixops > /dev/null
-    sudo chmod u=r,go=- /etc/ssh/ssh_rsa_key_nixops
-    pubkey=$(pass show $NIXOPS_CONFIG_PASS_SUBTREE_PATH/Nixops/SshKey.pub)
-    echo "$pubkey" | sudo tee /etc/ssh/ssh_rsa_key_nixops.pub > /dev/null
-    sudo chmod a=r /etc/ssh/ssh_rsa_key_nixops.pub
-    sudo chown $nix_user:$nix_group /etc/ssh/ssh_rsa_key_nixops /etc/ssh/ssh_rsa_key_nixops.pub
-    umask $mask
-  else
-    echo "Aborting"
-    exit 1
-  fi
-fi
-
 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
@@ -135,12 +94,11 @@ if nix show-config --json | jq -e '.sandbox.value == "true"' >/dev/null; then
 fi
 
 DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd )"
-source $(dirname $(dirname $DIR))/nix_path_env
-nixops="$(nix-build --no-out-link "$(dirname $DIR)/custom_nixops.nix")/bin/nixops"
 export NIXOPS_STATE="$(dirname $DIR)/state/eldiron.nixops"
 export NIXOPS_DEPLOYMENT="$DeploymentUuid"
+source $(dirname $(dirname $DIR))/scripts/nix_env
 
-if ! $nixops info 2>/dev/null >/dev/null; then
+if ! nixops_custom info 2>/dev/null >/dev/null; then
   cat <<-EOF
 	Importing deployment file into nixops:
 	Continue? [y/N]
@@ -148,15 +106,15 @@ if ! $nixops info 2>/dev/null >/dev/null; then
   read y
   if [ "$y" = "y" -o "$y" = "Y" ]; then
     deployment=$(pass show $NIXOPS_CONFIG_PASS_SUBTREE_PATH/Nixops/Deployment)
-    echo "$deployment" | $nixops import
-
-    $nixops modify "$(dirname $DIR)/eldiron.nix"
+    echo "$deployment" | nixops_custom import
   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