Merge branch 'ssh' into 'antifascista'

Soportar las llaves SSH de le usuarie

See merge request sutty/haini.sh!24

haini.sh

@@ -8,6 +8,7 @@ uname -m | grep -q x86_64 || exit 1
 DIR="$(dirname "$(realpath "$0")")"
 ROOT="$(dirname "$DIR")"
 SELF="$(basename "$0")"
+SSH_ADHOC=false
 
 # Sólo se puede correr desde el directorio de Sutty
 if test "$ROOT" != "$(dirname "$PWD")" && test "$ROOT" != "$PWD"; then
@@ -57,6 +58,7 @@ correr() {
     JEKYLL_ENV="${JEKYLL_ENV:-development}" \
     EDITOR="nano" \
     PAGER="less -niSFX" \
+    SSH_AUTH_SOCK="${SSH_AUTH_SOCK}" \
     bwrap \
     --die-with-parent \
     --unshare-user \
@@ -204,6 +206,10 @@ crear_entorno() {
     install -m 755 "$script" "$ENTORNO/usr/local/bin/${script##*/}"
   done
 
+  # Configurar SSH
+  install -m 700 -d "$ENTORNO/home/suttier/.ssh"
+  install -m 644 "$DIR/ssh/known_hosts" "$ENTORNO/home/suttier/.ssh/known_hosts"
+
   test -f "$ENTORNO/etc/ssl/certs/sutty.local.crt" || generar_certificado
   test -f "$ENTORNO/usr/local/share/ca-certificates/ca-sutty.crt" || mv "$ENTORNO/etc/ssl/certs/ca-sutty.crt" "$ENTORNO/usr/local/share/ca-certificates/ca-sutty.crt"
 }
@@ -227,6 +233,20 @@ esac
 if test "$HAIN_ENV"; then
   ${*:-$DEFAULT}
 else
+  if test -z "${SSH_AUTH_SOCK}"; then
+    if ! type ssh-agent >/dev/null 2>&1 ; then
+      echo "Instala ssh-agent para poder trabajar con git remoto dentro de haini.sh" >&2
+    else
+      SSH_ADHOC=true
+
+      echo "Iniciando un ssh-agent temporal." >&2
+      eval "$(ssh-agent)"
+      ssh-add
+    fi
+  fi
+
   crear_entorno
   stdin=/dev/stdin correr "${*:-$DEFAULT}"
+
+  ${SSH_ADHOC} && ssh-agent -k
 fi

packages

@@ -14,6 +14,7 @@ nano-syntax
 ncurses-terminfo
 nginx
 nodejs
+openssh-client
 openssl
 postgresql
 postgresql-contrib

ssh/known_hosts

@@ -0,0 +1,3 @@
+0xacab.org,198.252.153.239 ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIKdh69MJNIA4hZNdplalK1BOD4QZEKn8msMwsEzA7nrr
+athshe.sutty.nl,172.96.172.58 ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBIDqJl9IW6WXAxrtZXMzvMnIpTjIZB+Tp+dDUpSaOrqdjqdMVjHVQSFnVh0MLHbvdjKKtxaKDAuT3JXGrSp8wyA=
+anarres.sutty.nl,54.39.161.205 ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBGw9aXovdiR44WzGfaitjlGiAO7I5OP/XgxFEc+t6HWeS0oqIVaEo17y7j29hLZbTRpN8vWoGSMa+UtquQZ6JG8=