(reprovo) plibonigo ssh-agordo

Author: wdiestel

bin/setup_ssh.sh

@@ -3,27 +3,23 @@
 basedir=/home/afido
 
 # aldonu servilo-ŝlosilon por github.com
-touch ${basedir}/.ssh/known_hosts
-ssh-keygen -f ${basedir}/.ssh/known_hosts -R "github.com"
 
-if [ -f "/run/secrets/voko-afido.ssh_key.pub" ]; then
-
-    cat /run/secrets/voko-afido.ssh_key.pub > ${basedir}/.ssh/authorized_keys
+# se unua klonado ankoraŭ kaŭzas problemojn pri la servilo-ŝlosilo, jen du priaj diskutoj:
+# https://stackoverflow.com/questions/13363553/git-error-host-key-verification-failed-when-connecting-to-remote-repository
+# https://stackoverflow.com/questions/18711794/warning-permanently-added-the-rsa-host-key-for-ip-address
 
-    # unua klonado ankoraŭ kaŭzas problemojn pri la servilo-ŝlosilo, jen du priaj diskutoj:
-    # https://stackoverflow.com/questions/13363553/git-error-host-key-verification-failed-when-connecting-to-remote-repository
-    # https://stackoverflow.com/questions/18711794/warning-permanently-added-the-rsa-host-key-for-ip-address
+if [ ! -s ${basedir}/.ssh/known_hosts ]; then
+  #touch ${basedir}/.ssh/known_hosts
+  gh_rsa=$(ssh-keyscan -t rsa github.com)
 
-    ## momente ni ne bezonas tion, ĉar ni uzas GITHUB_TOKEN anst. DEPLOY-KEY
-    ##if [ ! -s ${basedir}/.ssh/known_hosts ]; then
-    ##  gh_rsa=$(ssh-keyscan -t rsa github.com)
-    ##
-    ##  gh_fp=$(echo -e "${gh_rsa}" | ssh-keygen -lf -)
-    ##  if [[ "${gh_fp}" == *"2048 SHA256:nThbg6kXUpJWGl7E1IGOCspRomTxdCARLviKw6E5SY8 github.com (RSA)"* ]]; then
-    ##    echo -e "${gh_rsa}" >> ${basedir}/.ssh/known_hosts
-    ##  fi  
-    ##fi
+  gh_fp=$(echo -e "${gh_rsa}" | ssh-keygen -lf -)
+  if [[ "${gh_fp}" == *"3072 SHA256:uNiVztksCsDhcc0u9e8BujQXVUpKZIDTMczCvj3tD2s github.com (RSA)"* ]]; then
+    echo -e "${gh_rsa}" >> ${basedir}/.ssh/known_hosts
+  fi  
+fi
 
+if [ -f "/run/secrets/voko-afido.ssh_key.pub" ]; then
+    cat /run/secrets/voko-afido.ssh_key.pub > ${basedir}/.ssh/authorized_keys
 fi
 
 chown -R afido:users ${basedir}/.ssh