From b23b67c1cc0b2541580f23c9aec97c0b84a823f4 Mon Sep 17 00:00:00 2001 From: James Moger <james.moger@gitblit.com> Date: Fri, 21 Feb 2014 09:56:37 -0500 Subject: [PATCH] Select default/configured gc period in create/edit repository page --- src/main/distrib/data/gitblit.properties | 299 ++++++++++++++++++++++++++++++++++++++--------------------- 1 files changed, 192 insertions(+), 107 deletions(-) diff --git a/src/main/distrib/data/gitblit.properties b/src/main/distrib/data/gitblit.properties index 1fe1561..da63832 100644 --- a/src/main/distrib/data/gitblit.properties +++ b/src/main/distrib/data/gitblit.properties @@ -145,6 +145,18 @@ # SINCE 1.2.0 git.allowCreateOnPush = true +# Global setting to control anonymous pushes. +# +# This setting allows/rejects anonymous pushes at the level of the receive pack. +# This trumps all repository config settings. While anonymous pushes are convenient +# on your own box when you are a lone developer, they are not recommended for +# any multi-user installation where accountability is required. Since Gitblit +# tracks pushes and user accounts, allowing anonymous pushes compromises that +# information. +# +# SINCE 1.4.0 +git.allowAnonymousPushes = false + # The default access restriction for new repositories. # Valid values are NONE, PUSH, CLONE, VIEW # NONE = anonymous view, clone, & push @@ -153,7 +165,7 @@ # VIEW = authenticated view, clone, & push # # SINCE 1.0.0 -git.defaultAccessRestriction = NONE +git.defaultAccessRestriction = PUSH # The default authorization control for new repositories. # Valid values are AUTHENTICATED and NAMED @@ -263,6 +275,34 @@ # # SINCE 1.2.0 git.defaultGarbageCollectionPeriod = 7 + +# Gitblit can automatically fetch ref updates for a properly configured mirror +# repository. +# +# Requirements: +# 1. you must manually clone the repository using native git +# git clone --mirror git://somewhere.com/myrepo.git +# 2. the "origin" remote must be the mirror source +# 3. the "origin" repository must be accessible without authentication OR the +# credentials must be embedded in the origin url (not recommended) +# +# Notes: +# 1. "origin" SSH urls are untested and not likely to work +# 2. mirrors cloned while Gitblit is running are likely to require clearing the +# gitblit cache (link on the repositories page of an administrator account) +# 3. Gitblit will automatically repair any invalid fetch refspecs with a "//" +# sequence. +# +# SINCE 1.4.0 +# RESTART REQUIRED +git.enableMirroring = false + +# Specify the period between update checks for mirrored repositories. +# The shortest period you may specify between mirror update checks is 5 mins. +# +# SINCE 1.4.0 +# RESTART REQUIRED +git.mirrorPeriod = 30 mins # Number of bytes of a pack file to load into memory in a single read operation. # This is the "page size" of the JGit buffer cache, used for all pack access @@ -522,16 +562,7 @@ web.projectsFile = ${baseFolder}/projects.conf # Either the full path to a user config file (users.conf) -# OR the full path to a simple user properties file (users.properties) # OR a fully qualified class name that implements the IUserService interface. -# -# Alternative user services: -# com.gitblit.LdapUserService -# com.gitblit.RedmineUserService -# com.gitblit.SalesforceUserService -# com.gitblit.WindowsUserService -# com.gitblit.PAMUserService -# com.gitblit.HtpasswdUserService # # Any custom user service implementation must have a public default constructor. # @@ -539,6 +570,25 @@ # RESTART REQUIRED # BASEFOLDER realm.userService = ${baseFolder}/users.conf + +# Ordered list of external authentication providers which will be used if +# authentication against the local user service fails. +# +# Valid providers are: +# +# htpasswd +# ldap +# pam +# redmine +# salesforce +# windows + +# e.g. realm.authenticationProviders = htpasswd windows +# +# SINCE 1.4.0 +# RESTART REQUIRED +# SPACE-DELIMITED +realm.authenticationProviders = # How to store passwords. # Valid values are plain, md5, or combined-md5. md5 is the hash of password. @@ -562,12 +612,25 @@ # SINCE 0.5.0 web.siteName = +# The canonical url of your Gitblit server to bs used in email notifications. +# e.g. web.canonicalUrl = https://demo-gitblit.rhcloud.com +# +# SINCE 1.4.0 +web.canonicalUrl = + # You may specify a different logo image for the header but it must be 120x45px. # If the specified file does not exist, the default Gitblit logo will be used. # # SINCE 1.3.0 # BASEFOLDER web.headerLogo = ${baseFolder}/logo.png + +# You may specify a different link URL for the logo image anchor. +# If blank the Gitblit main page URL is used. +# +# SINCE 1.3.0 +# BASEFOLDER +web.rootLink = # You may specify a custom header background CSS color. If unspecified, the # default color will be used. @@ -878,10 +941,13 @@ # SINCE 0.8.0 web.repositoryListSwatches = true -# Choose the diff presentation style: gitblt, gitweb, or plain +# Defines the default commit message renderer. This can be configured +# per-repository. # -# SINCE 0.5.0 -web.diffStyle = gitblit +# Valid values are: plain, markdown +# +# SINCE 1.4.0 +web.commitMessageRenderer = plain # Control if email addresses are shown in web ui # @@ -894,11 +960,16 @@ # SINCE 0.5.0 web.showSearchTypeSelection = false -# Generates a line graph of repository activity over time on the Summary page. -# This uses the Google Charts API. +# Controls display of activity graphs on the dashboard, activity, and summary +# pages. Charting makes use of the external Google Charts API. # # SINCE 0.5.0 web.generateActivityGraph = true + +# Displays the commits branch graph in the summary page and commits/log page. +# +# SINCE 1.4.0 +web.showBranchGraph = true # The default number of days to show on the activity page. # Value must exceed 0 else default of 7 is used @@ -952,6 +1023,11 @@ # SINCE 0.5.0 web.summaryRefsCount = 5 +# Show a README file, if available, on the summary page. +# +# SINCE 1.4.0 +web.summaryShowReadme = false + # The number of items to show on a page before showing the first, prev, next # pagination links. A default of 50 is used for any invalid value. # @@ -969,6 +1045,16 @@ # # SINCE 1.3.0 web.reflogChangesPerPage = 10 + +# Specify the names of documents in the root of your repository to be displayed +# in tabs on your repository docs page. If the name is not found in the root +# then no tab is added. The order specified is the order displayed. Do not +# specify a file extension as the aggregation of markup extensions + txt are used +# in the search algorithm. +# +# SPACE-DELIMITED +# SINCE 1.4.0 +web.documents = readme home index changelog contributing submitting_patches copying license notice authors # Registered file extensions to ignore during Lucene indexing # @@ -988,6 +1074,41 @@ # CASE-SENSITIVE # SINCE 0.5.0 web.markdownExtensions = md mkd markdown MD MKD + +# Registered extensions for mediawiki transformation +# +# SPACE-DELIMITED +# CASE-SENSITIVE +# SINCE 1.4.0 +web.mediawikiExtensions = mw mediawiki + +# Registered extensions for twiki transformation +# +# SPACE-DELIMITED +# CASE-SENSITIVE +# SINCE 1.4.0 +web.twikiExtensions = twiki + +# Registered extensions for textile transformation +# +# SPACE-DELIMITED +# CASE-SENSITIVE +# SINCE 1.4.0 +web.textileExtensions = textile + +# Registered extensions for confluence transformation +# +# SPACE-DELIMITED +# CASE-SENSITIVE +# SINCE 1.4.0 +web.confluenceExtensions = confluence + +# Registered extensions for tracwiki transformation +# +# SPACE-DELIMITED +# CASE-SENSITIVE +# SINCE 1.4.0 +web.tracwikiExtensions = tracwiki # Image extensions # @@ -1032,13 +1153,17 @@ # Use !!! to separate the search pattern and the replace pattern # searchpattern!!!replacepattern # SINCE 0.5.0 -regex.global.bug = \\b(Bug:)(\\s*[#]?|-){0,1}(\\d+)\\b!!!<a href="http://somehost/bug/$3">Bug-Id: $3</a> + +# regex.global.bug = \\b(Bug:)(\\s*[#]?|-){0,1}(\\d+)\\b!!!Bug: <a href="http://somehost/bug/$3">$3</a> # SINCE 0.5.0 -regex.global.changeid = \\b(Change-Id:\\s*)([A-Za-z0-9]*)\\b!!!<a href="http://somehost/changeid/$2">Change-Id: $2</a> + +# Example Gerrit links +# regex.global.changeid = \\b(Change-Id:\\s*)([A-Za-z0-9]*)\\b!!!Change-Id: <a href="http://somehost/r/#q,$2,n,z">$2</a> +# regex.global.reviewedon = \\b(Reviewed-on:\\s*)([A-Za-z0-9:/\\.]*)\\b!!!Reviewed-on: <a href="$2">$2</a> # Example per-repository regex substitutions overrides global # SINCE 0.5.0 -regex.myrepository.bug = \\b(Bug:)(\\s*[#]?|-){0,1}(\\d+)\\b!!!<a href="http://elsewhere/bug/$3">Bug-Id: $3</a> +# regex.myrepository.bug = \\b(Bug:)(\\s*[#]?|-){0,1}(\\d+)\\b!!!Bug: <a href="http://elsewhere/bug/$3">$3</a> # # Mail Settings @@ -1222,15 +1347,6 @@ # SINCE 1.3.0 realm.container.autoCreateAccounts = false -# The WindowsUserService must be backed by another user service for standard user -# and team management. -# default: users.conf -# -# RESTART REQUIRED -# BASEFOLDER -# SINCE 1.3.0 -realm.windows.backingUserService = ${baseFolder}/users.conf - # Allow or prohibit Windows guest account logins # # SINCE 1.3.0 @@ -1248,29 +1364,11 @@ # SINCE 1.3.0 realm.windows.defaultDomain = -# The PAMUserService must be backed by another user service for standard user -# and team management. -# default: users.conf -# -# RESTART REQUIRED -# BASEFOLDER -# SINCE 1.3.1 -realm.pam.backingUserService = ${baseFolder}/users.conf - # The PAM service name for authentication. # default: system-auth # # SINCE 1.3.1 realm.pam.serviceName = system-auth - -# The HtpasswdUserService must be backed by another user service for standard user -# and team management and attributes. This can be one of the local Gitblit user services. -# default: users.conf -# -# RESTART REQUIRED -# BASEFOLDER -# SINCE 1.3.2 -realm.htpasswd.backingUserService = ${baseFolder}/users.conf # The Apache htpasswd file that contains the users and passwords. # default: ${baseFolder}/htpasswd @@ -1279,30 +1377,6 @@ # BASEFOLDER # SINCE 1.3.2 realm.htpasswd.userfile = ${baseFolder}/htpasswd - -# Determines how accounts are looked up upon login. -# -# If set to false, then authentication for local accounts is done against -# the backing user service. -# If set to true, then authentication will first be checked against the -# htpasswd store, even if the account appears as a local account in the -# backing user service. If the user is found in the htpasswd store, then -# an already existing local account will be turned into an external account. -# In this case an initial local password is never used and gets overwritten -# by the externally stored password upon login. -# default: false -# -# SINCE 1.3.2 -realm.htpasswd.overrideLocalAuthentication = false - -# The SalesforceUserService must be backed by another user service for standard user -# and team management. -# default: users.conf -# -# RESTART REQUIRED -# BASEFOLDER -# SINCE 1.3.0 -realm.salesforce.backingUserService = ${baseFolder}/users.conf # Restrict the Salesforce user to members of this org. # default: 0 (i.e. do not check the Org ID) @@ -1329,15 +1403,6 @@ # # SINCE 1.0.0 realm.ldap.password = password - -# The LdapUserService must be backed by another user service for standard user -# and team management. -# default: users.conf -# -# SINCE 1.0.0 -# RESTART REQUIRED -# BASEFOLDER -realm.ldap.backingUserService = ${baseFolder}/users.conf # Delegate team membership control to LDAP. # @@ -1395,6 +1460,15 @@ # SINCE 1.0.0 realm.ldap.groupMemberPattern = (&(objectClass=group)(member=${dn})) +# Filter criteria for empty LDAP groups +# +# Query pattern to use when searching for an empty team. This may be any valid +# LDAP query expression, including the standard (&) and (|) operators. +# +# default: (&(objectClass=group)(!(member=*))) +# SINCE 1.4.0 +realm.ldap.groupEmptyMemberPattern = (&(objectClass=group)(!(member=*))) + # LDAP users or groups that should be given administrator privileges. # # Teams are specified with a leading '@' character. Groups with spaces in the @@ -1428,43 +1502,44 @@ # SINCE 1.0.0 realm.ldap.email = email -# Defines the cache period to be used when caching LDAP queries. This is currently -# only used for LDAP user synchronization. -# -# Must be of the form '<long> <TimeUnit>' where <TimeUnit> is one of 'MILLISECONDS', 'SECONDS', 'MINUTES', 'HOURS', 'DAYS' -# default: 2 MINUTES -# -# RESTART REQUIRED -realm.ldap.ldapCachePeriod = 2 MINUTES - -# Defines whether to synchronize all LDAP users into the backing user service -# -# Valid values: true, false -# If left blank, false is assumed -realm.ldap.synchronizeUsers.enable = false - -# Defines whether to delete non-existent LDAP users from the backing user service -# during synchronization. depends on realm.ldap.synchronizeUsers.enable = true -# -# Valid values: true, false -# If left blank, true is assumed -realm.ldap.synchronizeUsers.removeDeleted = true - # Attribute on the USER record that indicate their username to be used in gitblit # when synchronizing users from LDAP # if blank, Gitblit will use uid # For MS Active Directory this may be sAMAccountName +# +# SINCE 1.0.0 realm.ldap.uid = uid -# The RedmineUserService must be backed by another user service for standard user -# and team management. -# default: users.conf +# Defines whether to synchronize all LDAP users and teams into the user service +# +# Valid values: true, false +# If left blank, false is assumed +# +# SINCE 1.4.0 +realm.ldap.synchronize = false + +# Defines the period to be used when synchronizing users and teams from ldap. +# +# Must be of the form '<long> <TimeUnit>' where <TimeUnit> is one of 'MILLISECONDS', 'SECONDS', 'MINUTES', 'HOURS', 'DAYS' + +# default: 5 MINUTES # # RESTART REQUIRED -# BASEFOLDER -realm.redmine.backingUserService = ${baseFolder}/users.conf +# SINCE 1.4.0 +realm.ldap.syncPeriod = 5 MINUTES + +# Defines whether to delete non-existent LDAP users from the user service +# during synchronization. depends on realm.ldap.synchronize = true +# +# Valid values: true, false +# If left blank, true is assumed +# +# SINCE 1.4.0 +realm.ldap.removeDeletedUsers = true # URL of the Redmine. +# +# SINCE 1.2.0 realm.redmine.url = http://example.com/redmine # @@ -1521,6 +1596,16 @@ # RESTART REQUIRED server.ajpPort = 0 +# Automatically redirect http requests to the secure https connector. +# +# This setting requires that you have configured server.httpPort and server.httpsPort. +# Unless you are on a private LAN where you trust all client connections, it is +# recommended to use https for all communications. +# +# SINCE 1.4.0 +# RESTART REQUIRED +server.redirectToHttpsPort = false + # Specify the interface for Jetty to bind the standard connector. # 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 @@ -1528,7 +1613,7 @@ # # SINCE 0.5.0 # RESTART REQUIRED -server.httpBindInterface = localhost +server.httpBindInterface = # Specify the interface for Jetty to bind the secure connector. # You may specify an ip or an empty value to bind to all interfaces. @@ -1537,7 +1622,7 @@ # # SINCE 0.5.0 # RESTART REQUIRED -server.httpsBindInterface = localhost +server.httpsBindInterface = # Specify the interface for Jetty to bind the AJP connector. # You may specify an ip or an empty value to bind to all interfaces. -- Gitblit v1.9.1