Merge lp://staging/~cjwatson/isitdeployable/git-ssh-default-port into lp://staging/isitdeployable
Proposed by
Colin Watson
Status: | Merged |
---|---|
Approved by: | Colin Watson |
Approved revision: | 208 |
Merge reported by: | Otto Co-Pilot |
Merged at revision: | not available |
Proposed branch: | lp://staging/~cjwatson/isitdeployable/git-ssh-default-port |
Merge into: | lp://staging/isitdeployable |
Diff against target: |
63 lines (+23/-1) 3 files modified
django_project/settings_base.py (+1/-0) revtracker/tasks.py (+5/-0) revtracker/tests/test_tasks.py (+17/-1) |
To merge this branch: | bzr merge lp://staging/~cjwatson/isitdeployable/git-ssh-default-port |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Daniel Manrique (community) | Approve | ||
Review via email:
|
Commit message
Add GIT_SSH_
Description of the change
Due to Juju stealing port 22, git.launchpad.net's SSH service listens on port 9422, and the NAT rule that fixes that up is on the prodstack border firewall; so services within prodstack need to use port 9422 to talk to git.launchpad.net. Add a setting to let us do this without too much admin-visible ugliness.
To post a comment you must log in.
LGTM, thanks! (also thanks for the detailed explanation about why/when this is needed).