From 282b8fd82c46ba6874fb24c8715af103645f3406 Mon Sep 17 00:00:00 2001 From: David Ostrovsky <david@ostrovsky.org> Date: Thu, 10 Apr 2014 18:58:08 -0400 Subject: [PATCH] Fix message formatting --- src/main/distrib/data/gitblit.properties | 64 +++++++++++++++++++++++++++++++- 1 files changed, 62 insertions(+), 2 deletions(-) diff --git a/src/main/distrib/data/gitblit.properties b/src/main/distrib/data/gitblit.properties index 73c6ebd..64a52f5 100644 --- a/src/main/distrib/data/gitblit.properties +++ b/src/main/distrib/data/gitblit.properties @@ -83,7 +83,7 @@ # # SINCE 1.3.0 # RESTART REQUIRED -git.daemonBindInterface = localhost +git.daemonBindInterface = # port for serving the Git Daemon service. <= 0 disables this service. # On Unix/Linux systems, ports < 1024 require root permissions. @@ -92,6 +92,42 @@ # SINCE 1.3.0 # 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 # 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 @@ -479,6 +515,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 @@ -598,7 +641,7 @@ # # SINCE 1.2.1 # RESTART REQUIRED -fanout.bindInterface = localhost +fanout.bindInterface = # port for serving the Fanout PubSub service. <= 0 disables this service. # On Unix/Linux systems, ports < 1024 require root permissions. @@ -777,6 +820,14 @@ # # SINCE 0.5.0 web.allowAdministration = true + +# Setting to disable rendering the top-level navigation header which includes +# the login form, top-level links like dashboard, repositories, search, etc. +# This setting is only useful if you plan to embed Gitblit within another page +# or system. +# +# SINCE 1.4.0 +web.hideHeader = false # Allows rpc clients to list repositories and possibly manage or administer the # Gitblit server, if the authenticated account has administrator permissions. @@ -1508,6 +1559,15 @@ # SINCE 1.0.0 realm.ldap.password = password +# Bind pattern for Authentication. +# Allow to directly authenticate an user without LDAP Searches. +# +# e.g. CN=${username},OU=Users,OU=UserControl,OU=MyOrganization,DC=MyDomain +# +# SINCE 1.5.0 +realm.ldap.bindpattern = + + # Delegate team membership control to LDAP. # # If true, team user memberships will be specified by LDAP groups. This will -- Gitblit v1.9.1