Change add (default) ssh key fot ssh-agent.
This commit is contained in:
13
rcopy.sh
13
rcopy.sh
@@ -13,6 +13,8 @@ manual=${manual:=false}
|
||||
## -
|
||||
USER=$LOGNAME
|
||||
|
||||
DEFAULT_SSH_KEY="/root/.ssh/id_ed25519-backup"
|
||||
|
||||
## - global configuration for the remote backup-script
|
||||
## -
|
||||
rcopy_base_dir="$(realpath $(dirname $0))"
|
||||
@@ -46,10 +48,12 @@ fi
|
||||
NO_NEW_BACKUP=false
|
||||
ONLY_BACKUP=false
|
||||
MANUAL=false
|
||||
while getopts BhNm opt ; do
|
||||
while getopts Bhk:Nm opt ; do
|
||||
case $opt in
|
||||
B) ONLY_BACKUP=true
|
||||
;;
|
||||
k) SSH_KEY=$OPTARG
|
||||
;;
|
||||
m) MANUAL=true
|
||||
;;
|
||||
N) NO_NEW_BACKUP=true
|
||||
@@ -60,6 +64,10 @@ while getopts BhNm opt ; do
|
||||
esac
|
||||
done
|
||||
|
||||
if [[ -z "${SSH_KEY}" ]] ; then
|
||||
SSH_KEY="${DEFAULT_SSH_KEY}"
|
||||
fi
|
||||
|
||||
if $ONLY_BACKUP && $NO_NEW_BACKUP ; then
|
||||
fatal "Parameter '-B' AND '-N' is not possible."
|
||||
fi
|
||||
@@ -249,7 +257,8 @@ fi
|
||||
if [ ! -O $AGENT ] || ! ps ax | grep ssh-agent | grep -v grep > /dev/null ; then
|
||||
killall ssh-agent > /dev/null 2> /dev/null
|
||||
rm -f $AGENT
|
||||
ssh-agent > $AGENT; . $AGENT > /dev/null ; ssh-add > /dev/null 2>&1
|
||||
eval "$(ssh-agent -s)" > /dev/null 2>&1 ; ssh-add ${SSH_KEY} > /dev/null 2>&1;
|
||||
#ssh-agent > $AGENT; . $AGENT > /dev/null ; ssh-add > /dev/null 2>&1
|
||||
fi
|
||||
|
||||
|
||||
|
||||
Reference in New Issue
Block a user