summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorJames Moger <james.moger@gitblit.com>2014-07-01 09:29:10 -0400
committerJames Moger <james.moger@gitblit.com>2014-07-01 09:29:10 -0400
commit08b991702febefc8682bbca60fe813df8e29d8cb (patch)
tree101223af342dd8fc757b70cedbab06c537a5c45d /src
parent55db9a94272c0770262813807c923d5e092c93ca (diff)
parentb2ef5a6b0f5d5f78b334296aa9dfdde7571083e6 (diff)
downloadgitblit-08b991702febefc8682bbca60fe813df8e29d8cb.tar.gz
gitblit-08b991702febefc8682bbca60fe813df8e29d8cb.zip
Merge branch 'ticket/121' into develop
Diffstat (limited to 'src')
-rw-r--r--src/main/distrib/data/gitblit.properties14
1 files changed, 12 insertions, 2 deletions
diff --git a/src/main/distrib/data/gitblit.properties b/src/main/distrib/data/gitblit.properties
index 65fe41e5..d8ddc285 100644
--- a/src/main/distrib/data/gitblit.properties
+++ b/src/main/distrib/data/gitblit.properties
@@ -844,8 +844,18 @@ realm.minPasswordLength = 5
# 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
+# The canonical url of your Gitblit server to be used in repository url generation,
+# RSS feeds, and all embedded links in email and plugin-based notifications.
+#
+# If you are running Gitblit on a non-standard http port (i.e. not 80 and not 443)
+# then you must specify that port in this url otherwise your generated urls will be
+# incorrect.
+#
+# The hostname of this url will be extracted for SSH and GIT protocol repository
+# url generation.
+#
+# e.g. web.canonicalUrl = https://dev.gitblit.com
+# web.canonicalUrl = https://dev.gitblit.com:8443
#
# SINCE 1.4.0
web.canonicalUrl =