diff options
| author | Kamil Trzciński <ayufan@ayufan.eu> | 2017-03-16 21:38:55 +0300 |
|---|---|---|
| committer | Kamil Trzciński <ayufan@ayufan.eu> | 2017-03-16 21:38:55 +0300 |
| commit | 8a7c822dccfb612c8ae3cb646467c3deac648af8 (patch) | |
| tree | dab6fdc3a114fc1e5139e65ad3bf56eb8bf0d914 /config/gitlab.yml.example | |
| parent | 19d8f31f7b5a309189ad4684cefd144bc0e79dd2 (diff) | |
| parent | 75e78f108f850fe6c70c04a13747d2c40a511774 (diff) | |
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 'config/gitlab.yml.example')
| -rw-r--r-- | config/gitlab.yml.example | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/config/gitlab.yml.example b/config/gitlab.yml.example index 954809a882c..ba7f6773985 100644 --- a/config/gitlab.yml.example +++ b/config/gitlab.yml.example @@ -157,8 +157,8 @@ production: &base host: example.com port: 80 # Set to 443 if you serve the pages with HTTPS https: false # Set to true if you serve the pages with HTTPS - # external_http: "1.1.1.1:80" # If defined, enables custom domain support in GitLab Pages - # external_https: "1.1.1.1:443" # If defined, enables custom domain and certificate support in GitLab Pages + # external_http: ["1.1.1.1:80", "[2001::1]:80"] # If defined, enables custom domain support in GitLab Pages + # external_https: ["1.1.1.1:443", "[2001::1]:443"] # If defined, enables custom domain and certificate support in GitLab Pages ## Mattermost ## For enabling Add to Mattermost button |