feature: add settings for the ssh host

src/main/scala/gitbucket/core/controller/SystemSettingsController.scala

@@ -23,6 +23,7 @@ trait SystemSettingsControllerBase extends ControllerBase {
     "notification"             -> trim(label("Notification", boolean())),
     "activityLogLimit"         -> trim(label("Limit of activity logs", optional(number()))),
     "ssh"                      -> trim(label("SSH access", boolean())),
+    "sshHost"                  -> trim(label("SSH host", optional(text()))),
     "sshPort"                  -> trim(label("SSH port", optional(number()))),
     "useSMTP"                  -> trim(label("SMTP", boolean())),
     "smtp"                     -> optionalIfNotChecked("useSMTP", mapping(
@@ -50,9 +51,14 @@ trait SystemSettingsControllerBase extends ControllerBase {
         "keystore"                 -> trim(label("Keystore", optional(text())))
     )(Ldap.apply))
   )(SystemSettings.apply).verifying { settings =>
+    Vector(
       if(settings.ssh && settings.baseUrl.isEmpty){
-      Seq("baseUrl" -> "Base URL is required if SSH access is enabled.")
+        Some("baseUrl" -> "Base URL is required if SSH access is enabled.")
-    } else Nil
+      } else None,
+      if(settings.ssh && settings.sshHost.isEmpty){
+        Some("sshHost" -> "SSH host is required if SSH access is enabled.")
+      } else None
+    ).flatten
   }
 
   private val pluginForm = mapping(

src/main/scala/gitbucket/core/service/SystemSettingsService.scala

@@ -22,6 +22,7 @@ trait SystemSettingsService {
       props.setProperty(Notification, settings.notification.toString)
       settings.activityLogLimit.foreach(x => props.setProperty(ActivityLogLimit, x.toString))
       props.setProperty(Ssh, settings.ssh.toString)
+      settings.sshHost.foreach(x => props.setProperty(SshHost, x.trim))
       settings.sshPort.foreach(x => props.setProperty(SshPort, x.toString))
       props.setProperty(UseSMTP, settings.useSMTP.toString)
       if(settings.useSMTP) {
@@ -76,6 +77,7 @@ trait SystemSettingsService {
         getValue(props, Notification, false),
         getOptionValue[Int](props, ActivityLogLimit, None),
         getValue(props, Ssh, false),
+        getOptionValue[String](props, SshHost, None).map(_.trim),
         getOptionValue(props, SshPort, Some(DefaultSshPort)),
         getValue(props, UseSMTP, getValue(props, Notification, false)),   // handle migration scenario from only notification to useSMTP
         if(getValue(props, UseSMTP, getValue(props, Notification, false))){
@@ -127,6 +129,7 @@ object SystemSettingsService {
     notification: Boolean,
     activityLogLimit: Option[Int],
     ssh: Boolean,
+    sshHost: Option[String],
     sshPort: Option[Int],
     useSMTP: Boolean,
     smtp: Option[Smtp],
@@ -136,18 +139,10 @@ object SystemSettingsService {
 
     def sshAddress:Option[SshAddress] =
       for {
-      	host <- sshHostFromBaseUrl
+      	host <- sshHost
         if ssh
       }
       yield SshAddress(host, sshPort.getOrElse(DefaultSshPort))
-
-    // TODO host should be configured separately
-    private def sshHostFromBaseUrl:Option[String] =
-      for {
-        baseUrl <- baseUrl
-        m       <- """^https?://([^:/]+)""".r.findFirstMatchIn(baseUrl)
-      }
-      yield m.group(1)
   }
 
   case class Ldap(
@@ -186,6 +181,7 @@ object SystemSettingsService {
   private val Notification = "notification"
   private val ActivityLogLimit = "activity_log_limit"
   private val Ssh = "ssh"
+  private val SshHost = "ssh.host"
   private val SshPort = "ssh.port"
   private val UseSMTP = "useSMTP"
   private val SmtpHost = "smtp.host"

src/main/twirl/gitbucket/core/admin/system.scala.html

@@ -111,13 +111,22 @@
               Enable SSH access to git repository
             </label>
           </fieldset>
-          <div class="form-group ssh">
+          <div class="ssh">
+            <div class="form-group">
+              <label class="control-label col-md-3" for="sshHost">SSH Host</label>
+              <div class="col-md-9">
+                <input type="text" id="sshHost" name="sshHost" class="form-control" value="@settings.sshHost"/>
+                <span id="error-sshHost" class="error"></span>
+              </div>
+            </div>
+            <div class="form-group">
               <label class="control-label col-md-3" for="sshPort">SSH Port</label>
               <div class="col-md-9">
                 <input type="text" id="sshPort" name="sshPort" class="form-control" value="@settings.sshPort"/>
                 <span id="error-sshPort" class="error"></span>
               </div>
             </div>
+          </div>
           <p class="muted">
              Base URL is required if SSH access is enabled.
           </p>

src/test/scala/gitbucket/core/view/AvatarImageProviderSpec.scala

@@ -102,6 +102,7 @@ class AvatarImageProviderSpec extends Specification with Mockito {
       notification             = false,
       activityLogLimit         = None,
       ssh                      = false,
+      sshHost                  = None,
       sshPort                  = None,
       useSMTP                  = false,
       smtp                     = None,