diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2021-08-18 18:10:08 +0000 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2021-08-18 18:10:08 +0000 |
| commit | bc578c5f89ff9d8ec03fbbd014714f9d1e5cb172 (patch) | |
| tree | 50860880bb4f245730484e1538433c6667bbbf7b /lib/support | |
| parent | 07268180a2783e58115f872ae8ba6c95e80d79a9 (diff) | |
| download | gitlab-ce-bc578c5f89ff9d8ec03fbbd014714f9d1e5cb172.tar.gz | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'lib/support')
| -rwxr-xr-x | lib/support/init.d/gitlab | 2 | ||||
| -rw-r--r-- | lib/support/init.d/gitlab.default.example | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/lib/support/init.d/gitlab b/lib/support/init.d/gitlab index ac47c5be1e8..96e3a015115 100755 --- a/lib/support/init.d/gitlab +++ b/lib/support/init.d/gitlab @@ -44,7 +44,7 @@ gitlab_workhorse_log="$app_root/log/gitlab-workhorse.log" gitlab_pages_enabled=false gitlab_pages_dir=$(cd $app_root/../gitlab-pages 2> /dev/null && pwd) gitlab_pages_pid_path="$pid_path/gitlab-pages.pid" -gitlab_pages_options="-pages-domain example.com -pages-root $app_root/shared/pages -listen-proxy 127.0.0.1:8090" +gitlab_pages_options="-config $app_root/gitlab-pages/gitlab-pages.conf" gitlab_pages_log="$app_root/log/gitlab-pages.log" shell_path="/bin/bash" gitaly_enabled=true diff --git a/lib/support/init.d/gitlab.default.example b/lib/support/init.d/gitlab.default.example index 53bebe55fa3..0233c26cecc 100644 --- a/lib/support/init.d/gitlab.default.example +++ b/lib/support/init.d/gitlab.default.example @@ -68,7 +68,7 @@ gitlab_workhorse_log="$app_root/log/gitlab-workhorse.log" # The -pages-domain must be specified the same as in `gitlab.yml > pages > host`. # 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_options="-config $app_root/gitlab-pages/gitlab-pages.conf" gitlab_pages_log="$app_root/log/gitlab-pages.log" # mail_room_enabled specifies whether mail_room, which is used to process incoming email, is enabled. |