From 2c32fd202bac23df456d6515f1c33443cc803f35 Mon Sep 17 00:00:00 2001
From: James Moger <james.moger@gitblit.com>
Date: Tue, 13 Sep 2011 08:10:03 -0400
Subject: [PATCH] Revised federation setting names.  Improved documentation.

---
 distrib/gitblit.properties |   47 +++++++++++++++++++++++------------------------
 1 files changed, 23 insertions(+), 24 deletions(-)

diff --git a/distrib/gitblit.properties b/distrib/gitblit.properties
index ebdd0b0..5ea43cd 100644
--- a/distrib/gitblit.properties
+++ b/distrib/gitblit.properties
@@ -317,7 +317,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
+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
@@ -336,30 +359,6 @@
 #
 # SINCE 0.6.0
 federation.defaultFrequency = 60 mins
-
-# Specify the unique id of this Gitblit instance.
-#
-# 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.
-#
-# 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 pull registrations
 # Registrations are read once, at startup.

--
Gitblit v1.9.1