Commit 992ba636 authored by Achilleas Pipinellis's avatar Achilleas Pipinellis

Merge branch 'patch-22' into 'master'

cleanup application server setup

See merge request gitlab-org/gitlab-ce!18999
parents 35a02dc3 049e4fe4
...@@ -75,25 +75,24 @@ for each GitLab application server in your environment. ...@@ -75,25 +75,24 @@ for each GitLab application server in your environment.
servers should point to the external url that users will use to access GitLab. servers should point to the external url that users will use to access GitLab.
In a typical HA setup, this will be the url of the load balancer which will In a typical HA setup, this will be the url of the load balancer which will
route traffic to all GitLab application servers in the HA cluster. route traffic to all GitLab application servers in the HA cluster.
1. Run `sudo gitlab-ctl reconfigure` to compile the configuration. > **Note:** When you specify `https` in the `external_url`, as in the example
above, GitLab assumes you have SSL certificates in `/etc/gitlab/ssl/`. If
certificates are not present, Nginx will fail to start. See
[Nginx documentation](http://docs.gitlab.com/omnibus/settings/nginx.html#enable-https)
for more information.
## First GitLab application server ## First GitLab application server
As a final step, run the setup rake task on the first GitLab application server. As a final step, run the setup rake task **only on** the first GitLab application server.
It is not necessary to run this on additional application servers. Do not run this on additional application servers.
1. Initialize the database by running `sudo gitlab-rake gitlab:setup`. 1. Initialize the database by running `sudo gitlab-rake gitlab:setup`.
1. Run `sudo gitlab-ctl reconfigure` to compile the configuration.
> **WARNING:** Only run this setup task on **NEW** GitLab instances because it > **WARNING:** Only run this setup task on **NEW** GitLab instances because it
will wipe any existing data. will wipe any existing data.
> **Note:** When you specify `https` in the `external_url`, as in the example
above, GitLab assumes you have SSL certificates in `/etc/gitlab/ssl/`. If
certificates are not present, Nginx will fail to start. See
[Nginx documentation](http://docs.gitlab.com/omnibus/settings/nginx.html#enable-https)
for more information.
## Extra configuration for additional GitLab application servers ## Extra configuration for additional GitLab application servers
Additional GitLab servers (servers configured **after** the first GitLab server) Additional GitLab servers (servers configured **after** the first GitLab server)
...@@ -101,8 +100,7 @@ need some extra configuration. ...@@ -101,8 +100,7 @@ need some extra configuration.
1. Configure shared secrets. These values can be obtained from the primary 1. Configure shared secrets. These values can be obtained from the primary
GitLab server in `/etc/gitlab/gitlab-secrets.json`. Add these to GitLab server in `/etc/gitlab/gitlab-secrets.json`. Add these to
`/etc/gitlab/gitlab.rb` **prior to** running the first `reconfigure` in `/etc/gitlab/gitlab.rb` **prior to** running the first `reconfigure`.
the steps above.
```ruby ```ruby
gitlab_shell['secret_token'] = 'fbfb19c355066a9afb030992231c4a363357f77345edd0f2e772359e5be59b02538e1fa6cae8f93f7d23355341cea2b93600dab6d6c3edcdced558fc6d739860' gitlab_shell['secret_token'] = 'fbfb19c355066a9afb030992231c4a363357f77345edd0f2e772359e5be59b02538e1fa6cae8f93f7d23355341cea2b93600dab6d6c3edcdced558fc6d739860'
...@@ -115,6 +113,8 @@ need some extra configuration. ...@@ -115,6 +113,8 @@ need some extra configuration.
from running on upgrade. Only the primary GitLab application server should from running on upgrade. Only the primary GitLab application server should
handle migrations. handle migrations.
1. Run `sudo gitlab-ctl reconfigure` to compile the configuration.
## Troubleshooting ## Troubleshooting
- `mount: wrong fs type, bad option, bad superblock on` - `mount: wrong fs type, bad option, bad superblock on`
......
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