adopt add_eterkey.sh for user

etersoft/add_eterkey.sh → rooter/add_eterkey.sh

@@ -21,28 +21,27 @@ HOST=$2
 VEID=$3
 
 [ -n "$USERNAME" ] || fatal "Usage: $0 username host [VEID | -l]"
+[ -n "$HOST" ] || fatal "Usage: $0 username host [VEID | -l]"
 
-USERKEY=/home/$USERNAME/.ssh/id_dsa.pub
-if [ "$USERNAME" = "root" ] ; then
-	USERKEY=/root/.ssh/id_dsa.pub
-fi
-
-[ -r "$USERKEY" ] || USERKEY=/home/$USERNAME/.ssh/id_rsa.pub
+USERKEY=$(ssh rooter@server get pubkey $USERNAME)
 
-[ -r "$USERKEY" ] || fatal "Can't read ssh key $USERKEY"
+[ -n "$USERKEY" ] || fatal "Can't get ssh key"
 
 ssh $HOST echo || fatal "Host $HOST is not sshed"
 
+SUDO=
+[ "$UID" = 0 ] || SUDO="sudo"
+
 # 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"
 HSSH=/home/$USERNAME/.ssh
-ADDKEYCMD="useradd $USERNAME ; su - $USERNAME -c 'mkdir -p $HSSH ; chmod 700 $HSSH ; touch $HSSH/authorized_keys ; chmod 600 $HSSH/authorized_keys' ; cat >> $HSSH/authorized_keys"
+ADDKEYCMD="$SUDO useradd $USERNAME ; $SUDO su - $USERNAME -c 'mkdir -p $HSSH ; chmod 700 $HSSH ; touch $HSSH/authorized_keys ; chmod 600 $HSSH/authorized_keys' ; cat >> $HSSH/authorized_keys"
 
 # copy key in host system
 if [ -z "$VEID" ] ; then
 	echo "Copy key for $USERNAME to $HOST"
-	cat $USERKEY | docmd ssh $HOST "$ADDKEYCMD"
-	ssh $HOST ls /home/$USERNAME/.ssh -l
+	echo "$USERKEY" | docmd ssh $HOST "$ADDKEYCMD"
+	ssh $HOST $SUDO ls /home/$USERNAME/.ssh -l
 	#ssh -i $USERKEY $USERNAME@$HOST ls ~/.ssh -l
 	# TODO (.gitconfig)
 	#  git config --global user.email "you@example.com"
@@ -53,10 +52,10 @@ fi
 
 # show containter list
 if [ "$VEID" = "-l" ] ; then
-	docmd ssh $HOST vzlist
+	docmd ssh $HOST $SUDO vzlist
 	exit
 fi
 
 # copy key in VEID container at host system
 echo "Copy key for $USERNAME to $HOST, VEID=$VEID"
-cat $USERKEY | ssh $HOST "vzctl exec $VEID \"$ADDKEYCMD\""
+echo "$USERKEY" | ssh $HOST "$SUDO vzctl exec $VEID \"$ADDKEYCMD\""