Merge with ssh default port from rainerfrey#13
Closed
mcary wants to merge 5 commits into
Closed
Conversation
…t default. This causes rsync to honor .ssh/config entries automatically.
When rsync fails, I'm getting a deploy that looks like it went fine except for an inconspicuous message saying that rsync failed and a production deployment that's still on the old code version. Sometimes I don't notice right away that the new code is not actually live, and this is a big problem. I'd like to see a clear error message when rsync fails. Raise an exception of rsync fails to any of the servers receiving a code update.
When running rsync, the RsyncWithRemoteCache strategy doesn't heed Capistrano's :gateway parameter, which says to SSH to the server named by that parameter before connecting to the target server. Add support for a gateway by using the ProxyCommand SSH directive. Assume netcat is installed as nc on the target system.
Conflicts:
lib/capistrano/recipes/deploy/strategy/rsync_with_remote_cache.rb
Keep both rainerfrey's and mcary's changes to the rsync command.
Contributor
|
This commit addresses the port issue. I'll take a look through the rest of these commits -- there's been enough churn bringing this gem up-to-date, that your PR will no longer apply cleanly to master. Thanks for submitting this -- sorry for the delay. Better late than never I guess? |
Contributor
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Merge rainerfrey's contribution (the only outstanding contribution with test coverage) into mine and resolve conflicts. Evidently everyone's tweaks all touch the same line: the one with the rsync command.