diff options
| author | Achilleas Pipinellis <axilleas@axilleas.me> | 2016-02-22 02:39:27 +0200 |
|---|---|---|
| committer | James Edwards-Jones <jedwardsjones@gitlab.com> | 2017-01-31 22:55:29 +0000 |
| commit | f8c8dc03d007efeb52a6f81add6b49697001cb09 (patch) | |
| tree | 4299309ade34414476767007d09cc3100cdf0362 /doc | |
| parent | 3858443fdf96435d21dc3331169f9066793cf5e7 (diff) | |
| download | gitlab-ce-f8c8dc03d007efeb52a6f81add6b49697001cb09.tar.gz | |
Add remaining Omnibus configs
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/pages/administration.md | 34 |
1 files changed, 34 insertions, 0 deletions
diff --git a/doc/pages/administration.md b/doc/pages/administration.md index 2b861cc55cf..2b50ed1a126 100644 --- a/doc/pages/administration.md +++ b/doc/pages/administration.md @@ -217,6 +217,23 @@ Below are the four scenarios that are described in **Omnibus installations:** +1. Edit `/etc/gitlab/gitlab.rb`: + + ```ruby + nginx['listen_addresses'] = ['1.1.1.1'] + pages_nginx['enable'] = false + gitlab_pages['external_http'] = '1.1.1.2:80' + gitlab_pages['external_https'] = '1.1.1.2:443' + ``` + + where `1.1.1.1` is the primary IP address that GitLab is listening to and + `1.1.1.2` the secondary IP where the GitLab Pages daemon listens to. + Read more at the + [NGINX configuration for custom domains](#nginx-configuration-for-custom-domains) + section. + +1. [Reconfigure GitLab][reconfigure] + ### Custom domains without HTTPS support **Source installations:** @@ -266,6 +283,22 @@ Below are the four scenarios that are described in **Omnibus installations:** +1. Edit `/etc/gitlab/gitlab.rb`: + + ```ruby + nginx['listen_addresses'] = ['1.1.1.1'] + pages_nginx['enable'] = false + gitlab_pages['external_http'] = '1.1.1.2:80' + ``` + + where `1.1.1.1` is the primary IP address that GitLab is listening to and + `1.1.1.2` the secondary IP where the GitLab Pages daemon listens to. + Read more at the + [NGINX configuration for custom domains](#nginx-configuration-for-custom-domains) + section. + +1. [Reconfigure GitLab][reconfigure] + ### Wildcard HTTP domain without custom domains **Source installations:** @@ -313,6 +346,7 @@ Below are the four scenarios that are described in ```ruby pages_external_url 'http://example.io' ``` + 1. [Reconfigure GitLab][reconfigure] ### Wildcard HTTPS domain without custom domains |