From d823e010d653a6bf33ff232da5f90103be7515b8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Isma=C3=ABl=20Bouya?= <ismael.bouya@normalesup.org>
Date: Fri, 24 May 2019 13:27:22 +0200
Subject: Replace fetchgitPrivate by its builtins counterpart

---
 nixops/scripts/nixops_wrap |  4 ----
 nixops/scripts/setup       | 41 -----------------------------------------
 nixops/ssh/config          |  5 -----
 3 files changed, 50 deletions(-)
 delete mode 100644 nixops/ssh/config

(limited to 'nixops')

diff --git a/nixops/scripts/nixops_wrap b/nixops/scripts/nixops_wrap
index d03784e..9cf3388 100755
--- a/nixops/scripts/nixops_wrap
+++ b/nixops/scripts/nixops_wrap
@@ -14,10 +14,6 @@ nixops="$(nix-build --no-out-link "$(dirname $DIR)/custom_nixops.nix")/bin/nixop
 TEMP=$(mktemp -d /tmp/XXXXXX-nixops-files)
 chmod go-rwx $TEMP
 
-# __noChroot: ssh-config-file requires relaxed
-export NIX_PATH="ssh-config-file=$(dirname $DIR)/ssh/config:$NIX_PATH"
-
-
 finish() {
   rm -rf "$TEMP"
   $nixops set-args --unset privateFiles
diff --git a/nixops/scripts/setup b/nixops/scripts/setup
index 1586265..58dbf55 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
diff --git a/nixops/ssh/config b/nixops/ssh/config
deleted file mode 100644
index 3d4dc3e..0000000
--- a/nixops/ssh/config
+++ /dev/null
@@ -1,5 +0,0 @@
-Host git.immae.eu
-IdentityFile /etc/ssh/ssh_rsa_key_nixops
-StrictHostKeyChecking no
-UserKnownHostsFile /dev/null
-CheckHostIP no
-- 
cgit v1.2.3