Commit 5499e3ce authored by Vitaly Lipatov's avatar Vitaly Lipatov

add_eterkey: fix

parent af35be8d
...@@ -41,6 +41,7 @@ ssh $HOST echo || fatal "Host $HOST is not sshed" ...@@ -41,6 +41,7 @@ ssh $HOST echo || fatal "Host $HOST is not sshed"
SUDO= SUDO=
[ "$UID" = 0 ] || SUDO="sudo" [ "$UID" = 0 ] || SUDO="sudo"
HOSTSUDO=$SUDO HOSTSUDO=$SUDO
SSHOPT=""
# FIXME: почему-то в cat не раскрывается тильда! # FIXME: почему-то в cat не раскрывается тильда!
#ADDKEYCMD="useradd $USERNAME ; su - $USERNAME -c 'mkdir -p ~/.ssh ; chmod 700 ~/.ssh ; touch ~/.ssh/authorized_keys ; chmod 600 ~/.ssh/authorized_keys' ; cat >> /home/$USERNAME/.ssh/authorized_keys" #ADDKEYCMD="useradd $USERNAME ; su - $USERNAME -c 'mkdir -p ~/.ssh ; chmod 700 ~/.ssh ; touch ~/.ssh/authorized_keys ; chmod 600 ~/.ssh/authorized_keys' ; cat >> /home/$USERNAME/.ssh/authorized_keys"
...@@ -55,7 +56,7 @@ add_key_cmd() ...@@ -55,7 +56,7 @@ add_key_cmd()
if [ -z "$VEID" ] || [ "$VEID" = 0 ] ; then if [ -z "$VEID" ] || [ "$VEID" = 0 ] ; then
echo "Copy key for $USERNAME to host $HOST" echo "Copy key for $USERNAME to host $HOST"
echo "$USERKEY" | docmd ssh $HOST "$(add_key_cmd)" echo "$USERKEY" | docmd ssh $HOST "$(add_key_cmd)"
ssh $HOST $HOSTSUDO ls /home/$USERNAME/.ssh -l ssh $SSHOPT $HOST $HOSTSUDO ls /home/$USERNAME/.ssh -l
#ssh -i $USERKEY $USERNAME@$HOST ls ~/.ssh -l #ssh -i $USERKEY $USERNAME@$HOST ls ~/.ssh -l
# TODO (.gitconfig) # TODO (.gitconfig)
# git config --global user.email "you@example.com" # git config --global user.email "you@example.com"
...@@ -66,11 +67,11 @@ fi ...@@ -66,11 +67,11 @@ fi
# show containter list # show containter list
if [ "$VEID" = "-l" ] ; then if [ "$VEID" = "-l" ] ; then
docmd ssh $HOST $HOSTSUDO vzlist docmd ssh $SSHOPT $HOST $HOSTSUDO vzlist
exit exit
fi fi
# copy key in VEID container at host system # copy key in VEID container at host system
echo "Copy key for $USERNAME to $HOST, VEID=$VEID" echo "Copy key for $USERNAME to $HOST, VEID=$VEID"
SUDO= SUDO=
echo "$USERKEY" | ssh $HOST "$HOSTSUDO vzctl exec $VEID \"$(add_key_cmd)\"" echo "$USERKEY" | ssh $SSHOPT $HOST "$HOSTSUDO vzctl exec $VEID \"$(add_key_cmd)\""
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment