From f6740d55ff80bc6e16da5c3df0ee1ba2235d6629 Mon Sep 17 00:00:00 2001 From: James Moger <james.moger@gitblit.com> Date: Mon, 26 Sep 2011 15:33:19 -0400 Subject: [PATCH] Implemented a Federation Client. Bare clone tweaks. Documentation. --- distrib/gitblit.properties | 74 ++++++++++++++++++++++++------------ 1 files changed, 49 insertions(+), 25 deletions(-) diff --git a/distrib/gitblit.properties b/distrib/gitblit.properties index ebdd0b0..e8acfa9 100644 --- a/distrib/gitblit.properties +++ b/distrib/gitblit.properties @@ -226,22 +226,26 @@ # Registered extensions for google-code-prettify # +# SPACE-DELIMITED # SINCE 0.5.0 web.prettyPrintExtensions = c cpp cs css htm html java js php pl prefs properties py rb sh sql xml vb # Registered extensions for markdown transformation # +# SPACE-DELIMITED # CASE-SENSITIVE # SINCE 0.5.0 web.markdownExtensions = md mkd markdown MD MKD # Image extensions # +# SPACE-DELIMITED # SINCE 0.5.0 web.imageExtensions = bmp jpg gif png # Registered extensions for binary blobs # +# SPACE-DELIMITED # SINCE 0.5.0 web.binaryExtensions = jar pdf tar.gz zip @@ -304,8 +308,9 @@ # SINCE 0.6.0 mail.fromAddress = -# Space-separated list of email addresses for the Gitblit administrators +# List of email addresses for the Gitblit administrators # +# SPACE-DELIMITED # SINCE 0.6.0 mail.adminAddresses = @@ -317,7 +322,30 @@ # # *git.enableGitServlet* must be true to use this feature. +# Your federation name is used for federation status acknowledgments. If it is +# unset, and you elect to send a status acknowledgment, your Gitblit instance +# will be identified by its hostname, if available, else your internal ip address. +# The source Gitblit instance will also append your external IP address to your +# identification to differentiate multiple pulling systems behind a single proxy. # +# SINCE 0.6.0 +federation.name = + +# Specify the passphrase of this Gitblit instance. +# +# An unspecified (empty) passphrase disables processing federation requests. +# +# This value can be anything you want: an integer, a sentence, an haiku, etc. +# Keep the value simple, though, to avoid Java properties file encoding issues. +# +# Changing your passphrase will break any registrations you have established with other +# Gitblit instances. +# +# CASE-SENSITIVE +# SINCE 0.6.0 +# RESTART REQUIRED *(only to enable or disable federation)* +federation.passphrase = + # Control whether or not this Gitblit instance can receive federation proposals # from another Gitblit instance. Registering a federated Gitblit is a manual # process. Proposals help to simplify that process by allowing a remote Gitblit @@ -337,29 +365,16 @@ # SINCE 0.6.0 federation.defaultFrequency = 60 mins -# Specify the unique id of this Gitblit instance. +# Federation Sets are named groups of repositories. The Federation Sets are +# available for selection in the repository settings page. You can assign a +# repository to one or more sets and then distribute the token for the set. +# This allows you to grant federation pull access to a subset of your available +# repositories. Tokens for federation sets only grant repository pull access. # -# An unspecified (empty) uuid disables procesing federation requests. -# -# This value can be anything you want: an integer, a sentence, an haiku, etc. -# Keep the value simple, though, to avoid Java properties file encoding issues. -# -# Changing your uuid will break any registrations you have established with other -# Gitblit instances. -# +# SPACE-DELIMITED # CASE-SENSITIVE # SINCE 0.6.0 -# RESTART REQUIRED -federation.uuid = - -# Your federation name is used for federation status acknowledgments. If it is -# unset, and you elect to send a status acknowledgment, your Gitblit instance -# will be identified by its hostname, if available, else your internal ip address. -# The source Gitblit instance will also append your external IP address to your -# identification to differentiate multiple pulling systems behind a single proxy. -# -# SINCE 0.6.0 -federation.name = +federation.sets = # Federation pull registrations # Registrations are read once, at startup. @@ -370,11 +385,18 @@ # The shortest frequency allowed is every 5 minutes # Decimal frequency values are cast to integers # Frequency values may be specified in mins, hours, or days -# Values that can not be parsed default to *federation.defaultFrequency* +# Values that can not be parsed or are unspecified default to *federation.defaultFrequency* # # folder: -# if blank, the folder is *git.repositoriesFolder* +# if unspecified, the folder is *git.repositoriesFolder* # if specified, the folder is relative to *git.repositoriesFolder* +# +# mirror: +# if true, each repository HEAD is reset to *origin/master* after each pull. +# The repository will be flagged *isFrozen* after the initial clone. +# +# if false, each repository HEAD will point to the FETCH_HEAD of the initial +# clone from the origin until pushed to or otherwise manipulated. # # mergeAccounts: # if true, remote accounts and their permissions are merged into your @@ -385,7 +407,7 @@ # notified by email of pull failures # # include and exclude: -# space-separated list of repositories to include or exclude from pull +# Space-delimited list of repositories to include or exclude from pull # may be * wildcard to include or exclude all # may use fuzzy match (e.g. org.eclipse.*) @@ -396,7 +418,9 @@ #federation.example1.url = https://go.gitblit.com #federation.example1.token = 6f3b8a24bf970f17289b234284c94f43eb42f0e4 #federation.example1.frequency = 120 mins -#federation.example1.folder = +#federation.example1.folder = +#federation.example1.bare = true +#federation.example1.mirror = true #federation.example1.mergeAccounts = true # -- Gitblit v1.9.1