Commit 76911330 authored by Achilleas Pipinellis's avatar Achilleas Pipinellis

Merge branch 'pages-role-docs' into 'master'

Make GitLab Pages on separate server docs use new Pages role

See merge request gitlab-org/gitlab!47876
parents c7de6083 70c2a7f4
...@@ -553,7 +553,6 @@ database encryption. Proceed with caution. ...@@ -553,7 +553,6 @@ database encryption. Proceed with caution.
1. On the **GitLab server**, to enable Pages, add the following to `/etc/gitlab/gitlab.rb`: 1. On the **GitLab server**, to enable Pages, add the following to `/etc/gitlab/gitlab.rb`:
```ruby ```ruby
gitlab_pages['enable'] = true
pages_external_url "http://<pages_server_URL>" pages_external_url "http://<pages_server_URL>"
``` ```
...@@ -584,18 +583,11 @@ database encryption. Proceed with caution. ...@@ -584,18 +583,11 @@ database encryption. Proceed with caution.
to include: to include:
```ruby ```ruby
external_url 'http://<gitlab_server_IP_or_URL>' roles ['pages_role']
pages_external_url "http://<pages_server_URL>" pages_external_url "http://<pages_server_URL>"
postgresql['enable'] = false
redis['enable'] = false gitlab_pages['gitlab_server'] = 'http://<gitlab_server_IP_or_URL>'
prometheus['enable'] = false
puma['enable'] = false
sidekiq['enable'] = false
gitlab_workhorse['enable'] = false
gitaly['enable'] = false
alertmanager['enable'] = false
node_exporter['enable'] = false
gitlab_rails['auto_migrate'] = false
``` ```
1. Create a backup of the secrets file on the **Pages server**: 1. Create a backup of the secrets file on the **Pages server**:
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment