diff --git a/.travis.yml b/.travis.yml index 4c49943e..0aea3273 100644 --- a/.travis.yml +++ b/.travis.yml @@ -32,7 +32,7 @@ before_deploy: - eval "$(ssh-agent -s)" - chmod 600 /tmp/deploy_rsa - ssh-add /tmp/deploy_rsa -- ssh-keyscan barry.podshows.fr >> ~/.ssh/known_hosts +- ssh-keyscan -p4242 barry.podshows.fr >> ~/.ssh/known_hosts deploy: - provider: script script: "./deploy.sh" diff --git a/deploy.sh b/deploy.sh index dead4fcc..729e8334 100755 --- a/deploy.sh +++ b/deploy.sh @@ -12,6 +12,7 @@ DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null && pwd )" cd $DIR SSH_HOST=podcloud@barry.podshows.fr +SSH_PORT=4242 COMPOSE_PROJECT_NAME=podcloud BASE=/home/podcloud/production/services/feeds KEEP_RELEASES=2 @@ -19,13 +20,13 @@ KEEP_RELEASES=2 RELEASEN=$(date -u +%Y%m%d%H%M%S) echo "Creating release" -ssh $SSH_HOST BASE=$BASE RELEASEN=$RELEASEN 'bash -s' <<'CMD' +ssh -p$SSH_PORT $SSH_HOST BASE=$BASE RELEASEN=$RELEASEN 'bash -s' <<'CMD' mkdir -vp $BASE/releases/$RELEASEN CMD -rsync -avzPhc --recursive --files-from=deploy.files . $SSH_HOST:$BASE/releases/$RELEASEN/ +rsync -e "ssh -p$SSH_PORT" -avzPhc --recursive --files-from=deploy.files . $SSH_HOST:$BASE/releases/$RELEASEN/ -ssh $SSH_HOST BASE=$BASE KEEP_RELEASES=$KEEP_RELEASES RELEASEN=$RELEASEN COMPOSE_PROJECT_NAME=$COMPOSE_PROJECT_NAME 'bash -s' <<'CMD' +ssh -p$SSH_PORT $SSH_HOST BASE=$BASE KEEP_RELEASES=$KEEP_RELEASES RELEASEN=$RELEASEN COMPOSE_PROJECT_NAME=$COMPOSE_PROJECT_NAME 'bash -s' <<'CMD' # exit when any command fails set -e