diff options
| author | James Moger <james.moger@gitblit.com> | 2015-06-15 10:58:10 -0600 |
|---|---|---|
| committer | James Moger <james.moger@gitblit.com> | 2015-06-15 10:58:10 -0600 |
| commit | 0805ff838562e3b19d31083d80762abcd0ebd106 (patch) | |
| tree | 2e1f1b470a3e7c9a8ae5faed48a0e1574fca547c /src/main/java/com/gitblit/transport/ssh/WelcomeShell.java | |
| parent | 35a925961d5df5cbdf5ddb7df80b616064b3e0e9 (diff) | |
| parent | b3aabb94c9935e61ba16bb5ab506c123ae29fbf3 (diff) | |
| download | gitblit-0805ff838562e3b19d31083d80762abcd0ebd106.tar.gz gitblit-0805ff838562e3b19d31083d80762abcd0ebd106.zip | |
Merged #259 "Allow custom host & port specification for advertised SSH urls"
Diffstat (limited to 'src/main/java/com/gitblit/transport/ssh/WelcomeShell.java')
| -rw-r--r-- | src/main/java/com/gitblit/transport/ssh/WelcomeShell.java | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/src/main/java/com/gitblit/transport/ssh/WelcomeShell.java b/src/main/java/com/gitblit/transport/ssh/WelcomeShell.java index 852756a7..ec6f7291 100644 --- a/src/main/java/com/gitblit/transport/ssh/WelcomeShell.java +++ b/src/main/java/com/gitblit/transport/ssh/WelcomeShell.java @@ -200,13 +200,18 @@ public class WelcomeShell implements Factory<Command> { } private String formatUrl(String hostname, int port, String username) { - if (port == 22) { + int displayPort = settings.getInteger(Keys.git.sshAdvertisedPort, port); + String displayHostname = settings.getString(Keys.git.sshAdvertisedHost, ""); + if(displayHostname.isEmpty()) { + displayHostname = hostname; + } + if (displayPort == 22) { // standard port - return MessageFormat.format("{0}@{1}/REPOSITORY.git", username, hostname); + return MessageFormat.format("{0}@{1}/REPOSITORY.git", username, displayHostname); } else { // non-standard port return MessageFormat.format("ssh://{0}@{1}:{2,number,0}/REPOSITORY.git", - username, hostname, port); + username, displayHostname, displayPort); } } } |