Skip to content
Browse files

merged via

  • Loading branch information...
1 parent 38095f5 commit 25965061eb5705dbf098313ffdf2bbe89f606b02 @philcryer committed Apr 23, 2012
Showing with 1 addition and 2 deletions.
  1. +1 −2 install.sh
View
3 install.sh
@@ -104,7 +104,7 @@ ssh_keygen(){
exit 1
fi
else
- su ${username} -c "cat /home/${username}/.ssh/id_rsa.pub | ssh $remote_server -p ${port} 'cat - > /home/${username}/.ssh/id_dsa.pub'" >> /dev/null
+ su ${username} -c "cat /home/${username}/.ssh/id_dsa.pub | ssh $remote_server -p ${port} 'cat - >> /home/${username}/.ssh/authorized_keys'" >> /dev/null
if [ $? -eq 0 ]; then
X=0 #echo "done"
else
@@ -198,7 +198,6 @@ deploy(){
initial_sync(){
echo -n "* Doing inital sync with server..."
. /etc/lipsyncd
- #su $USER_NAME -c 'rsync -rav --stats --log-file=/home/'$USER_NAME'/.lipsyncd/lipsyncd.log -e "ssh -l '$USER_NAME' -p '$SSH_PORT'" '$REMOTE_HOST':'$LOCAL_DIR' '$REMOTE_DIR''
su $USER_NAME -c 'rsync -rav --stats --log-file=/home/'$USER_NAME'/.lipsyncd/lipsyncd.log -e "ssh -l '$USER_NAME' -p '$SSH_PORT'" '$REMOTE_HOST':'$REMOTE_DIR' '$LOCAL_DIR''
echo "Initial sync `date` Completed" > /home/$username/.lipsyncd/lipsyncd.log
}

0 comments on commit 2596506

Please sign in to comment.
Something went wrong with that request. Please try again.