summaryrefslogtreecommitdiff
path: root/lib/support
diff options
context:
space:
mode:
authorAchilleas Pipinellis <axilleas@axilleas.me>2016-02-10 10:51:18 +0000
committerAchilleas Pipinellis <axilleas@axilleas.me>2016-02-10 10:51:18 +0000
commit10aa99a30c311c59358d1547ebcbe0f6a92227a7 (patch)
treef61c6a0000e42d4bbe2ffaba4ac0a08700880c27 /lib/support
parent17240f80cb11a0721da1416ecf38acc7aae9bccd (diff)
parent464cea7d4892e76bcb39f0a3eaf848369178293a (diff)
downloadgitlab-ce-10aa99a30c311c59358d1547ebcbe0f6a92227a7.tar.gz
Merge branch 'doc_relative_url' into 'master'
Add documentation on relative URL support closes #12773 See merge request !2770
Diffstat (limited to 'lib/support')
-rwxr-xr-xlib/support/init.d/gitlab.default.example13
1 files changed, 9 insertions, 4 deletions
diff --git a/lib/support/init.d/gitlab.default.example b/lib/support/init.d/gitlab.default.example
index 4e6e56ac2db..cc8617b72ca 100755
--- a/lib/support/init.d/gitlab.default.example
+++ b/lib/support/init.d/gitlab.default.example
@@ -34,11 +34,16 @@ sidekiq_pid_path="$pid_path/sidekiq.pid"
# /home/git/gitlab-workhorse .
gitlab_workhorse_dir=$(cd $app_root/../gitlab-workhorse && pwd)
gitlab_workhorse_pid_path="$pid_path/gitlab-workhorse.pid"
+
# The -listenXxx settings determine where gitlab-workhorse
-# listens for connections from NGINX. To listen on localhost:8181, write
-# '-listenNetwork tcp -listenAddr localhost:8181'.
-# The -authBackend setting tells gitlab-workhorse where it can reach
-# Unicorn.
+# listens for connections from the web server. By default it listens to a
+# socket. To listen on TCP connections (needed by Apache) change to:
+# '-listenNetwork tcp -listenAddr 127.0.0.1:8181'
+#
+# The -authBackend setting tells gitlab-workhorse where it can reach Unicorn.
+# For relative URL support change to:
+# '-authBackend http://127.0.0.1/8080/gitlab'
+# Read more in http://doc.gitlab.com/ce/install/relative_url.html
gitlab_workhorse_options="-listenUmask 0 -listenNetwork unix -listenAddr $socket_path/gitlab-workhorse.socket -authBackend http://127.0.0.1:8080 -authSocket $socket_path/gitlab.socket -documentRoot $app_root/public"
gitlab_workhorse_log="$app_root/log/gitlab-workhorse.log"