The Unified and Autonomous Development Platform
Improvments to support git via ssh and to ui
Andrea Del Bene41e23941bb8f
diff --git a/server-core/src/main/java/io/onedev/server/maintenance/DefaultDataManager.java b/server-core/src/main/java/io/onedev/server/maintenance/DefaultDataManager.javaindex f26f9bdb25..7fab5080c1 100644--- a/server-core/src/main/java/io/onedev/server/maintenance/DefaultDataManager.java+++ b/server-core/src/main/java/io/onedev/server/maintenance/DefaultDataManager.java@@ -144,7 +144,16 @@ public class DefaultDataManager implements DataManager, Serializable {systemSetting = new SystemSetting();systemSetting.setServerUrl(serverUrl.toString(StringMode.FULL));- systemSetting.setServerSshUrl(serverUrl.getHost()+ ":" + serverConfig.getSshPort());++ String sshUrl = serverUrl.getHost();+ int sshPort = serverConfig.getSshPort();++ if (sshPort != 22) {+ sshUrl += ":" + sshPort;+ }++ systemSetting.setServerSshUrl(sshUrl);+} else if (!validator.validate(setting.getValue()).isEmpty()) {systemSetting = (SystemSetting) setting.getValue();}diff --git a/server-core/src/main/java/io/onedev/server/model/support/administration/SystemSetting.java b/server-core/src/main/java/io/onedev/server/model/support/administration/SystemSetting.javaindex db5ec10f25..f8d351193c 100644--- a/server-core/src/main/java/io/onedev/server/model/support/administration/SystemSetting.java+++ b/server-core/src/main/java/io/onedev/server/model/support/administration/SystemSetting.java@@ -80,7 +80,7 @@ public class SystemSetting implements Serializable, Validatable {return true;}- @Editable(name="Ssh URL", order=90, description="ssh url")+ @Editable(name="Ssh URL", order=90, description="Specify the URL to use with Git to access repositories via SSH")@NotEmptypublic String getServerSshUrl() {return serverSshUrl;diff --git a/server-core/src/main/java/io/onedev/server/web/page/my/sshkeys/InsertSshKeyPanel.html b/server-core/src/main/java/io/onedev/server/web/page/my/sshkeys/InsertSshKeyPanel.htmlindex 4d61214c16..56aeab103f 100644--- a/server-core/src/main/java/io/onedev/server/web/page/my/sshkeys/InsertSshKeyPanel.html+++ b/server-core/src/main/java/io/onedev/server/web/page/my/sshkeys/InsertSshKeyPanel.html@@ -11,11 +11,11 @@<div name="feedback"></div><div class="form-group">- <label>Key Name *</label> <input wicket:id="name"+ <label>Key name</label><span class="required">*</span> <input wicket:id="name"class="form-control"></div><div class="form-group">- <label>Value *</label>+ <label>Value</label><span class="required">*</span><textarea wicket:id="content" rows="10" class="form-control"></textarea></div><div wicket:id="feedback">diff --git a/server-product/system/conf/server.properties b/server-product/system/conf/server.propertiesindex fc3c5cfcb4..cbc904a5cf 100644--- a/server-product/system/conf/server.properties+++ b/server-product/system/conf/server.properties@@ -7,6 +7,8 @@ session_timeout=1800#http_port=6610+ssh_port=40789+# Uncomment below properties to enable https support##https_port=6643@@ -20,4 +22,4 @@ http_port=6610# path to directory containing CA PEM files to be trusted by OneDev. Non-absolute path is# considered to be relative to OneDev conf directory-#trust_certs=trust-certs\ No newline at end of file+#trust_certs=trust-certs