diff options
author | Marcel Amirault <ravlen@gmail.com> | 2019-05-06 00:56:13 +0000 |
---|---|---|
committer | Achilleas Pipinellis <axil@gitlab.com> | 2019-05-06 00:56:13 +0000 |
commit | 1775c8c73b20cb637d85703a1ee03aaf7d1f5e5e (patch) | |
tree | 22a9f8f3d741c67076175e6fd9299e433aba1865 /doc/administration | |
parent | f5f4a00108e296f51db610a68c6637f1d6c7b1cc (diff) | |
download | gitlab-ce-1775c8c73b20cb637d85703a1ee03aaf7d1f5e5e.tar.gz |
Docs: Realigning scattered EE docs into CE
Diffstat (limited to 'doc/administration')
-rw-r--r-- | doc/administration/index.md | 2 | ||||
-rw-r--r-- | doc/administration/operations/extra_sidekiq_processes.md | 14 |
2 files changed, 8 insertions, 8 deletions
diff --git a/doc/administration/index.md b/doc/administration/index.md index 986f8146831..02e88dbd2a6 100644 --- a/doc/administration/index.md +++ b/doc/administration/index.md @@ -72,7 +72,7 @@ Learn how to install, configure, update, and maintain your GitLab instance. - [Branded login page](../customization/branded_login_page.md): Customize the login page with your own logo, title, and description. - [Welcome message](../customization/welcome_message.md): Add a custom welcome message to the sign-in page. - ["New Project" page](../customization/new_project_page.md): Customize the text to be displayed on the page that opens whenever your users create a new project. -- [Additional custom email text](https://docs.gitlab.com/ee/user/admin_area/settings/email.html#custom-additional-text): Add additional custom text to emails sent from GitLab. **[PREMIUM ONLY]** +- [Additional custom email text](https://docs.gitlab.com/ee/user/admin_area/settings/email.html#custom-additional-text-premium-only): Add additional custom text to emails sent from GitLab. **[PREMIUM ONLY]** ### Maintaining GitLab diff --git a/doc/administration/operations/extra_sidekiq_processes.md b/doc/administration/operations/extra_sidekiq_processes.md index 6f23610345f..286b99aceb5 100644 --- a/doc/administration/operations/extra_sidekiq_processes.md +++ b/doc/administration/operations/extra_sidekiq_processes.md @@ -93,11 +93,11 @@ This tells the additional processes how often to check for enqueued jobs. ## Starting extra processes via command line Starting extra Sidekiq processes can be done using the command -`/opt/gitlab/embedded/service/gitlab-rails/bin/sidekiq-cluster`. This command +`/opt/gitlab/embedded/service/gitlab-rails/ee/bin/sidekiq-cluster`. This command takes arguments using the following syntax: ```bash -/opt/gitlab/embedded/service/gitlab-rails/bin/sidekiq-cluster [QUEUE,QUEUE,...] [QUEUE, ...] +/opt/gitlab/embedded/service/gitlab-rails/ee/bin/sidekiq-cluster [QUEUE,QUEUE,...] [QUEUE, ...] ``` Each separate argument denotes a group of queues that have to be processed by a @@ -115,14 +115,14 @@ For example, say you want to start 2 extra processes: one to process the done as follows: ```bash -/opt/gitlab/embedded/service/gitlab-rails/bin/sidekiq-cluster process_commit post_receive +/opt/gitlab/embedded/service/gitlab-rails/ee/bin/sidekiq-cluster process_commit post_receive ``` If you instead want to start one process processing both queues you'd use the following syntax: ```bash -/opt/gitlab/embedded/service/gitlab-rails/bin/sidekiq-cluster process_commit,post_receive +/opt/gitlab/embedded/service/gitlab-rails/ee/bin/sidekiq-cluster process_commit,post_receive ``` If you want to have one Sidekiq process process the "process_commit" and @@ -130,7 +130,7 @@ If you want to have one Sidekiq process process the "process_commit" and you'd use the following: ```bash -/opt/gitlab/embedded/service/gitlab-rails/bin/sidekiq-cluster process_commit,post_receive gitlab_shell +/opt/gitlab/embedded/service/gitlab-rails/ee/bin/sidekiq-cluster process_commit,post_receive gitlab_shell ``` ### Monitoring @@ -162,7 +162,7 @@ file is written, but this can be changed by passing the `--pidfile` option to `sidekiq-cluster`. For example: ```bash -/opt/gitlab/embedded/service/gitlab-rails/bin/sidekiq-cluster --pidfile /var/run/gitlab/sidekiq_cluster.pid process_commit +/opt/gitlab/embedded/service/gitlab-rails/ee/bin/sidekiq-cluster --pidfile /var/run/gitlab/sidekiq_cluster.pid process_commit ``` Keep in mind that the PID file will contain the PID of the `sidekiq-cluster` @@ -199,7 +199,7 @@ one thread per queue up to a maximum of 50. If you wish to change the cap, use the `-m N` option. For example, this would cap the maximum number of threads to 1: ```bash -/opt/gitlab/embedded/service/gitlab-rails/bin/sidekiq-cluster process_commit,post_receive -m 1 +/opt/gitlab/embedded/service/gitlab-rails/ee/bin/sidekiq-cluster process_commit,post_receive -m 1 ``` For each queue group, the concurrency factor will be set to min(number of |