diff options
| author | Kamil Trzciński <ayufan@ayufan.eu> | 2017-03-16 18:38:55 +0000 |
|---|---|---|
| committer | Kamil Trzciński <ayufan@ayufan.eu> | 2017-03-16 18:38:55 +0000 |
| commit | 8a7c822dccfb612c8ae3cb646467c3deac648af8 (patch) | |
| tree | dab6fdc3a114fc1e5139e65ad3bf56eb8bf0d914 /lib | |
| parent | 19d8f31f7b5a309189ad4684cefd144bc0e79dd2 (diff) | |
| parent | 75e78f108f850fe6c70c04a13747d2c40a511774 (diff) | |
| download | gitlab-ce-8a7c822dccfb612c8ae3cb646467c3deac648af8.tar.gz | |
Merge branch 'pages-multiple-ips-doc' into 'master'
The GitLab Pages external-http and external-https arguments can be specified multiple times
See merge request !9812
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/support/init.d/gitlab.default.example | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/support/init.d/gitlab.default.example b/lib/support/init.d/gitlab.default.example index e5797d8fe3c..f6642527639 100644 --- a/lib/support/init.d/gitlab.default.example +++ b/lib/support/init.d/gitlab.default.example @@ -56,14 +56,14 @@ gitlab_workhorse_log="$app_root/log/gitlab-workhorse.log" # The value of -listen-http must be set to `gitlab.yml > pages > external_http` # as well. For example: # -# -listen-http 1.1.1.1:80 +# -listen-http 1.1.1.1:80 -listen-http [2001::1]:80 # # To enable HTTPS support for custom domains add the `-listen-https`, # `-root-cert` and `-root-key` directives in `gitlab_pages_options` below. # The value of -listen-https must be set to `gitlab.yml > pages > external_https` # as well. For example: # -# -listen-https 1.1.1.1:443 -root-cert /path/to/example.com.crt -root-key /path/to/example.com.key +# -listen-https 1.1.1.1:443 -listen-http [2001::1]:443 -root-cert /path/to/example.com.crt -root-key /path/to/example.com.key # # The -pages-domain must be specified the same as in `gitlab.yml > pages > host`. # Set `gitlab_pages_enabled=true` if you want to enable the Pages feature. |