diff options
Diffstat (limited to 'doc/administration/high_availability')
5 files changed, 11 insertions, 9 deletions
diff --git a/doc/administration/high_availability/gitlab.md b/doc/administration/high_availability/gitlab.md index 6c90c66973d..cdafdbc4954 100644 --- a/doc/administration/high_availability/gitlab.md +++ b/doc/administration/high_availability/gitlab.md @@ -162,7 +162,7 @@ If you enable Monitoring, it must be enabled on **all** GitLab servers. node_exporter['listen_address'] = '0.0.0.0:9100' gitlab_workhorse['prometheus_listen_addr'] = '0.0.0.0:9229' sidekiq['listen_address'] = "0.0.0.0" - unicorn['listen'] = '0.0.0.0' + puma['listen'] = '0.0.0.0' # Add the monitoring node's IP address to the monitoring whitelist and allow it to # scrape the NGINX metrics. Replace placeholder `monitoring.gitlab.example.com` with @@ -174,9 +174,11 @@ If you enable Monitoring, it must be enabled on **all** GitLab servers. 1. Run `sudo gitlab-ctl reconfigure` to compile the configuration. CAUTION: **Warning:** - After changing `unicorn['listen']` in `gitlab.rb`, and running `sudo gitlab-ctl reconfigure`, - it can take an extended period of time for Unicorn to complete reloading after receiving a `HUP`. - For more information, see the [issue](https://gitlab.com/gitlab-org/omnibus-gitlab/issues/4401). + If running Unicorn, after changing `unicorn['listen']` in `gitlab.rb`, and + running `sudo gitlab-ctl reconfigure`, it can take an extended period of time + for Unicorn to complete reloading after receiving a `HUP`. For more + information, see the + [issue](https://gitlab.com/gitlab-org/omnibus-gitlab/issues/4401). ## Troubleshooting diff --git a/doc/administration/high_availability/monitoring_node.md b/doc/administration/high_availability/monitoring_node.md index 3e6fdbf9b1c..409a4dfecb9 100644 --- a/doc/administration/high_availability/monitoring_node.md +++ b/doc/administration/high_availability/monitoring_node.md @@ -64,7 +64,7 @@ Omnibus: redis['enable'] = false redis_exporter['enable'] = false sidekiq['enable'] = false - unicorn['enable'] = false + puma['enable'] = false node_exporter['enable'] = false gitlab_exporter['enable'] = false ``` diff --git a/doc/administration/high_availability/pgbouncer.md b/doc/administration/high_availability/pgbouncer.md index f0e76172a00..3b56008feb7 100644 --- a/doc/administration/high_availability/pgbouncer.md +++ b/doc/administration/high_availability/pgbouncer.md @@ -165,7 +165,7 @@ Refer to your preferred Load Balancer's documentation for further guidance. 1. Run `gitlab-ctl reconfigure` -1. On the node running Unicorn, make sure the following is set in `/etc/gitlab/gitlab.rb` +1. On the node running Puma, make sure the following is set in `/etc/gitlab/gitlab.rb` ```ruby gitlab_rails['db_host'] = 'PGBOUNCER_HOST' diff --git a/doc/administration/high_availability/redis.md b/doc/administration/high_availability/redis.md index 3af175b8539..945f456c904 100644 --- a/doc/administration/high_availability/redis.md +++ b/doc/administration/high_availability/redis.md @@ -63,7 +63,7 @@ Omnibus: ## Disable all other services sidekiq['enable'] = false gitlab_workhorse['enable'] = false - unicorn['enable'] = false + puma['enable'] = false postgresql['enable'] = false nginx['enable'] = false prometheus['enable'] = false diff --git a/doc/administration/high_availability/sidekiq.md b/doc/administration/high_availability/sidekiq.md index 2c1dea890af..493929dcf3b 100644 --- a/doc/administration/high_availability/sidekiq.md +++ b/doc/administration/high_availability/sidekiq.md @@ -88,7 +88,7 @@ you want using steps 1 and 2 from the GitLab downloads page. postgresql['enable'] = false redis['enable'] = false redis_exporter['enable'] = false - unicorn['enable'] = false + puma['enable'] = false gitlab_exporter['enable'] = false ``` @@ -119,7 +119,7 @@ postgres_exporter['enable'] = false postgresql['enable'] = false redis['enable'] = false redis_exporter['enable'] = false -unicorn['enable'] = false +puma['enable'] = false gitlab_exporter['enable'] = false ######################################## |