summaryrefslogtreecommitdiff
path: root/lib/support
diff options
context:
space:
mode:
authorAchilleas Pipinellis <axilleas@axilleas.me>2016-02-21 23:06:44 +0200
committerJames Edwards-Jones <jedwardsjones@gitlab.com>2017-01-31 22:55:29 +0000
commitcfc54df4a8386ec5d58ba55fff98264fe746e3ba (patch)
tree3eafcdd71dff46f44ba45aa56119f38d1004043d /lib/support
parent39dff1e1066d2e33267602f11f611af145ba169a (diff)
downloadgitlab-ce-cfc54df4a8386ec5d58ba55fff98264fe746e3ba.tar.gz
Set pages daemon to false
Diffstat (limited to 'lib/support')
-rwxr-xr-xlib/support/init.d/gitlab.default.example10
1 files changed, 5 insertions, 5 deletions
diff --git a/lib/support/init.d/gitlab.default.example b/lib/support/init.d/gitlab.default.example
index f096298afbb..e5797d8fe3c 100755
--- a/lib/support/init.d/gitlab.default.example
+++ b/lib/support/init.d/gitlab.default.example
@@ -47,9 +47,9 @@ gitlab_workhorse_pid_path="$pid_path/gitlab-workhorse.pid"
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"
-# The GitLab Pages Daemon needs to use a separate IP address on which it will
-# listen. You can also use different ports than 80 or 443 that will be
-# forwarded to GitLab Pages Daemon.
+# The GitLab Pages Daemon needs either a separate IP address on which it will
+# listen or use different ports than 80 or 443 that will be forwarded to GitLab
+# Pages Daemon.
#
# To enable HTTP support for custom domains add the `-listen-http` directive
# in `gitlab_pages_options` below.
@@ -66,8 +66,8 @@ gitlab_workhorse_log="$app_root/log/gitlab-workhorse.log"
# -listen-https 1.1.1.1:443 -root-cert /path/to/example.com.crt -root-key /path/to/example.com.key
#
# The -pages-domain must be specified the same as in `gitlab.yml > pages > host`.
-# Set `gitlab_pages_enabled=false` if you want to disable the Pages feature.
-gitlab_pages_enabled=true
+# Set `gitlab_pages_enabled=true` if you want to enable the Pages feature.
+gitlab_pages_enabled=false
gitlab_pages_options="-pages-domain example.com -pages-root $app_root/shared/pages -listen-proxy 127.0.0.1:8090"
gitlab_pages_log="$app_root/log/gitlab-pages.log"