From e39524a70402f8f3e8df28a92492533cf4607eb9 Mon Sep 17 00:00:00 2001
From: USER <USER@DOMAIN.com>
Date: Fri, 23 Jun 2023 21:23:26 +0100
Subject: [PATCH] .

---
 bin/cPull2 | 52 +++++++++++++++++++++++++++++++++++++++++++++-------
 1 file changed, 45 insertions(+), 7 deletions(-)

diff --git a/bin/cPull2 b/bin/cPull2
index d6db3ed..a08eb4e 100755
--- a/bin/cPull2
+++ b/bin/cPull2
@@ -67,21 +67,46 @@ check_keystore () {
   fi
 }
 
+check_bastionkey () {
+  if [ ! -f ${BASTIONKEY} ]
+  then
+    ssh-keygen -o -a 100 -t ed25519 -f ${BASTIONKEY} -N "" -C bastion@${NAME}
+    cp -p ${BASTIONKEY}.pub ${KEYSTORE}/_b${NAME}.pub
+    cp -p ${BASTIONKEY}.pub ${KEYSTORE}/_d${NAME}.pub
+  fi
+}
+
 check_gitkey () {
   if [ ! -f ${GITKEY} ]
   then
-    ssh-keygen -o -a 100 -t ed25519 -f ${GITKEY} -N "" -C git@${MYNAME}
+    ssh-keygen -o -a 100 -t ed25519 -f ${GITKEY} -N "" -C git@${NAME}
   fi
 }
 
 check_rsynckey () {
   if [ ! -f ${RSYNCKEY} ]
   then
-    ssh-keygen -o -a 100 -t ed25519 -f ${RSYNCKEY} -N "" -C rsync@${MYNAME}
-    cp -p ${RSYNCKEY}.pub ${KEYSTORE}/_r${MYNAME}.pub
+    ssh-keygen -o -a 100 -t ed25519 -f ${RSYNCKEY} -N "" -C rsync@${NAME}
+    cp -p ${RSYNCKEY}.pub ${KEYSTORE}/_r${NAME}.pub
   fi
 }
 
+check_vibblerkey () {
+  if [ ! -f ${VIBBLERKEY} ]
+  then
+    ssh-keygen -o -a 100 -t ed25519 -f ${VIBBLERKEY} -N "" -C vibbler@${NAME}
+    cp -p ${VIBBLERKEY}.pub ${KEYSTORE}/_v${NAME}.pub
+  fi
+}
+
+check_key () {
+  if [ ! -f ${KEYSTORE}/${KEYNAME} ]
+  then
+    ssh-keygen -o -a 100 -t ed25519 -f ${KEYSTORE}/${KEYNAME} -N "" -C ${KEYNAME}@${MACHINENAME}
+  fi
+  cp -p ${KEYSTORE}/${KEYNAME}.pub ${KEYSTORE}/${KEYNAME_SHORT}${MACHINENAME}.pub
+}
+
 ##
 ##
 ##
@@ -242,12 +267,25 @@ RSYNCKEY=${KEYSTORE}/rsync
 BASTIONKEY=${KEYSTORE}/bastion
 STATIC=/static
 
+
 set_constants
-check_rsync
+
+NAME=$(uname -n|cut -c2-4)
+LAST=$(uname -n| sed -e 's/.*\(.$\)/\1/')
+NAME=$(uname -n)
+LAST=$(uname -n)
+
 check_keystore
-check_gitkey
-check_rsynckey
-check_lock
+
+
+KEYNAME=rsync
+KEYNAME_SHORT=${PREFIX}$(echo $KEYNAME|cut -c1-2)${ID}
+check_key
+
+
+
+
+
 
 #####
 # custom code