Merge pull request 'Direct to CDN test is successful' (#1) from direct-cdn into main

Reviewed-on: #1

renewkeys.sh

@@ -9,9 +9,6 @@ PC=$(uname -n | awk '{print $1}')
 
 guardband() {
 if [ $? -ne 0 ]; then
-echo -e "${CY}Cleaning up temp directory for checksums...${NF}"
-rm -rf /.SSH/.temp
-sleep 2
 echo -e "${CR}Script Exited with an Error.${NF}"
 exit 1
 fi
@@ -26,29 +23,13 @@ if ! wget --spider "$CDN" 2>/dev/null; then
     return 1
     else
     echo -e "${CG}CDN available for checksum downloads - ${FB}Proceeding...${NF}"
+    serversidePUB=$(wget https://cdn.franscorack.com/chksum/sshprov/pub -q -O -)
+    serversidePRIV=$(wget https://cdn.franscorack.com/chksum/sshprov/priv -q -O -)
     sleep 2
 fi
 }
 
-downloadpub(){
-wget -q https://cdn.franscorack.com/chksum/sshprov/pub -O /.SSH/.temp/pub
-if [ $? -ne 0 ]; then
-    echo -e "${CR}Download error: CDN reported error in file download${NF}"
-    return 1
-fi
-}
-
-downloadpriv(){
-wget -q https://cdn.franscorack.com/chksum/sshprov/priv -O /.SSH/.temp/priv
-if [ $? -ne 0 ]; then
-    echo -e "${CR}Download error: CDN reported error in file download${NF}"
-    return 1
-fi
-}
-
 rootcheck(){
-serversidePRIV=$(cat /.SSH/.temp/priv | awk '{print $1}')
-serversidePUB=$(cat /.SSH/.temp/pub | awk '{print $1}')
 if [ -f /root/.ssh/id_ed25519 ]; then
 rootPRIV=$(sha256sum /root/.ssh/id_ed25519 | awk '{print $1}')
 else
@@ -198,8 +179,12 @@ if [ "$UID" -ne 0 ]; then
 fi
 echo -e ${CY}Warning: running this script resets known_hosts file. Abort this script using CTRL+C if you want to avoid that.${NF}
 sleep 3
+if [ -f /home/$USER/.ssh/known_hosts ]; then
 rm /home/$USER/.ssh/known_hosts
+fi
+if [ -f /root/.ssh/known_hosts ]; then
 rm /root/.ssh/known_hosts
+fi
 if [ ! -f ".SSH/.temp" ]; then
 mkdir /.SSH/.temp
 fi
@@ -207,19 +192,11 @@ if [ "$PC" = "pve01" ]
 then
 verifycdn
 guardband
-downloadpub
-guardband
-downloadpriv
-guardband
 rootcheck
 guardband
 else
 verifycdn
 guardband
-downloadpub
-guardband
-downloadpriv
-guardband
 rootcheck
 guardband
 admincheck