From e9872c8ca4d9af41794a851f2f81ed21c65bb85b Mon Sep 17 00:00:00 2001 From: James Moger <james.moger@gitblit.com> Date: Thu, 10 Apr 2014 19:01:30 -0400 Subject: [PATCH] Allow specifying accepted PUSH transports --- src/main/distrib/data/gitblit.properties | 71 +++++++++++++++++++++++++++++++++++ 1 files changed, 71 insertions(+), 0 deletions(-) diff --git a/src/main/distrib/data/gitblit.properties b/src/main/distrib/data/gitblit.properties index b819b38..c7e3a21 100644 --- a/src/main/distrib/data/gitblit.properties +++ b/src/main/distrib/data/gitblit.properties @@ -93,6 +93,48 @@ # RESTART REQUIRED git.daemonPort = 9418 +# The port for serving the SSH service. <= 0 disables this service. +# On Unix/Linux systems, ports < 1024 require root permissions. +# Recommended value: 29418 +# +# SINCE 1.5.0 +# RESTART REQUIRED +git.sshPort = 29418 + +# Specify the interface for the SSH daemon to bind its service. +# You may specify an ip or an empty value to bind to all interfaces. +# Specifying localhost will result in Gitblit ONLY listening to requests to +# localhost. +# +# SINCE 1.5.0 +# RESTART REQUIRED +git.sshBindInterface = + +# Specify the SSH key manager to use for retrieving, storing, and removing +# SSH keys. +# +# Valid key managers are: +# com.gitblit.transport.ssh.FileKeyManager +# +# SINCE 1.5.0 +git.sshKeysManager = com.gitblit.transport.ssh.FileKeyManager + +# Directory for storing user SSH keys when using the FileKeyManager. +# +# SINCE 1.5.0 +git.sshKeysFolder= ${baseFolder}/ssh + +# SSH backend NIO2|MINA. +# +# SINCE 1.5.0 +git.sshBackend = NIO2 + +# Number of thread for starting SSH commands. +# +# SINCE 1.5.0 +git.sshCommandStartThreads = 2 + + # Allow push/pull over http/https with JGit servlet. # If you do NOT want to allow Git clients to clone/push to Gitblit set this # to false. You might want to do this if you are only using ssh:// or git://. @@ -130,6 +172,16 @@ # # SINCE 0.9.0 git.onlyAccessBareRepositories = false + + +# Specify the list of acceptable transports for pushes. +# If this setting is empty, all transports are acceptable. +# +# Valid choices are: GIT HTTP HTTPS SSH +# +# SINCE 1.5.0 +# SPACE-DELIMITED +git.acceptedPushTransports = HTTP HTTPS SSH # Allow an authenticated user to create a destination repository on a push if # the repository does not already exist. @@ -479,6 +531,13 @@ # SINCE 1.4.0 tickets.requireApproval = false +# The case-insensitive regular expression used to identify and close tickets on +# push to the integration branch for commits that are NOT already referenced as +# a patchset tip. +# +# SINCE 1.5.0 +tickets.closeOnPushCommitMessageRegex = (?:fixes|closes)[\\s-]+#?(\\d+) + # Specify the location of the Lucene Ticket index # # SINCE 1.4.0 @@ -499,6 +558,18 @@ # SINCE 1.4.0 tickets.perPage = 25 +# The folder where plugins are loaded from. +# +# SINCE 1.5.0 +# RESTART REQUIRED +# BASEFOLDER +plugins.folder = ${baseFolder}/plugins + +# The registry of available plugins. +# +# SINCE 1.5.0 +plugins.registry = http://gitblit.github.io/gitblit-registry/plugins.json + # # Groovy Integration # -- Gitblit v1.9.1