Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Boxiang Sun
gitlab-ce
Commits
4022466e
Commit
4022466e
authored
Jun 04, 2018
by
Natho
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Update IPs to valid example IPs.
As per:
https://tools.ietf.org/html/rfc5737
parent
c0d1e386
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
21 additions
and
21 deletions
+21
-21
doc/administration/pages/index.md
doc/administration/pages/index.md
+11
-11
doc/administration/pages/source.md
doc/administration/pages/source.md
+9
-9
doc/install/kubernetes/gitlab_omnibus.md
doc/install/kubernetes/gitlab_omnibus.md
+1
-1
No files found.
doc/administration/pages/index.md
View file @
4022466e
...
@@ -83,12 +83,12 @@ you need to add a [wildcard DNS A record][wiki-wildcard-dns] pointing to the
...
@@ -83,12 +83,12 @@ you need to add a [wildcard DNS A record][wiki-wildcard-dns] pointing to the
host that GitLab runs. For example, an entry would look like this:
host that GitLab runs. For example, an entry would look like this:
```
```
*.example.io. 1800 IN A 1
.1.1
.1
*.example.io. 1800 IN A 1
92.0.2
.1
*.example.io. 1800 IN AAAA 2001::1
*.example.io. 1800 IN AAAA 2001::1
```
```
where
`example.io`
is the domain under which GitLab Pages will be served
where
`example.io`
is the domain under which GitLab Pages will be served
and
`1
.1.1
.1`
is the IPv4 address of your GitLab instance and
`2001::1`
is the
and
`1
92.0.2
.1`
is the IPv4 address of your GitLab instance and
`2001::1`
is the
IPv6 address. If you don't have IPv6, you can omit the AAAA record.
IPv6 address. If you don't have IPv6, you can omit the AAAA record.
> **Note:**
> **Note:**
...
@@ -193,13 +193,13 @@ world. Custom domains are supported, but no TLS.
...
@@ -193,13 +193,13 @@ world. Custom domains are supported, but no TLS.
```shell
```shell
pages_external_url "http://example.io"
pages_external_url "http://example.io"
nginx['listen_addresses'] = ['1
.1.1
.1']
nginx['listen_addresses'] = ['1
92.0.2
.1']
pages_nginx['enable'] = false
pages_nginx['enable'] = false
gitlab_pages['external_http'] = ['1
.1.1
.2:80', '[2001::2]:80']
gitlab_pages['external_http'] = ['1
92.0.2
.2:80', '[2001::2]:80']
```
```
where `1
.1.1
.1` is the primary IP address that GitLab is listening to and
where `1
92.0.2
.1` is the primary IP address that GitLab is listening to and
`1
.1.1
.2` and `2001::2` are the secondary IPs the GitLab Pages daemon
`1
92.0.2
.2` and `2001::2` are the secondary IPs the GitLab Pages daemon
listens on. If you don't have IPv6, you can omit the IPv6 address.
listens on. If you don't have IPv6, you can omit the IPv6 address.
1.
[
Reconfigure GitLab
][
reconfigure
]
1.
[
Reconfigure GitLab
][
reconfigure
]
...
@@ -228,16 +228,16 @@ world. Custom domains and TLS are supported.
...
@@ -228,16 +228,16 @@ world. Custom domains and TLS are supported.
```shell
```shell
pages_external_url "https://example.io"
pages_external_url "https://example.io"
nginx['listen_addresses'] = ['1
.1.1
.1']
nginx['listen_addresses'] = ['1
92.0.2
.1']
pages_nginx['enable'] = false
pages_nginx['enable'] = false
gitlab_pages['cert'] = "/etc/gitlab/ssl/example.io.crt"
gitlab_pages['cert'] = "/etc/gitlab/ssl/example.io.crt"
gitlab_pages['cert_key'] = "/etc/gitlab/ssl/example.io.key"
gitlab_pages['cert_key'] = "/etc/gitlab/ssl/example.io.key"
gitlab_pages['external_http'] = ['1
.1.1
.2:80', '[2001::2]:80']
gitlab_pages['external_http'] = ['1
92.0.2
.2:80', '[2001::2]:80']
gitlab_pages['external_https'] = ['1
.1.1
.2:443', '[2001::2]:443']
gitlab_pages['external_https'] = ['1
92.0.2
.2:443', '[2001::2]:443']
```
```
where `1
.1.1
.1` is the primary IP address that GitLab is listening to and
where `1
92.0.2
.1` is the primary IP address that GitLab is listening to and
`1
.1.1
.2` and `2001::2` are the secondary IPs where the GitLab Pages daemon
`1
92.0.2
.2` and `2001::2` are the secondary IPs where the GitLab Pages daemon
listens on. If you don't have IPv6, you can omit the IPv6 address.
listens on. If you don't have IPv6, you can omit the IPv6 address.
1.
[
Reconfigure GitLab
][
reconfigure
]
1.
[
Reconfigure GitLab
][
reconfigure
]
...
...
doc/administration/pages/source.md
View file @
4022466e
...
@@ -67,11 +67,11 @@ you need to add a [wildcard DNS A record][wiki-wildcard-dns] pointing to the
...
@@ -67,11 +67,11 @@ you need to add a [wildcard DNS A record][wiki-wildcard-dns] pointing to the
host that GitLab runs. For example, an entry would look like this:
host that GitLab runs. For example, an entry would look like this:
```
```
*.example.io. 1800 IN A 1
.1.1
.1
*.example.io. 1800 IN A 1
92.0.2
.1
```
```
where
`example.io`
is the domain under which GitLab Pages will be served
where
`example.io`
is the domain under which GitLab Pages will be served
and
`1
.1.1
.1`
is the IP address of your GitLab instance.
and
`1
92.0.2
.1`
is the IP address of your GitLab instance.
> **Note:**
> **Note:**
You should not use the GitLab domain to serve user pages. For more information
You should not use the GitLab domain to serve user pages. For more information
...
@@ -253,7 +253,7 @@ world. Custom domains are supported, but no TLS.
...
@@ -253,7 +253,7 @@ world. Custom domains are supported, but no TLS.
port: 80
port: 80
https: false
https: false
external_http: 1
.1.1
.2:80
external_http: 1
92.0.2
.2:80
```
```
1.
Edit
`/etc/default/gitlab`
and set
`gitlab_pages_enabled`
to
`true`
in
1.
Edit
`/etc/default/gitlab`
and set
`gitlab_pages_enabled`
to
`true`
in
...
@@ -263,7 +263,7 @@ world. Custom domains are supported, but no TLS.
...
@@ -263,7 +263,7 @@ world. Custom domains are supported, but no TLS.
```
```
gitlab_pages_enabled=true
gitlab_pages_enabled=true
gitlab_pages_options="-pages-domain example.io -pages-root $app_root/shared/pages -listen-proxy 127.0.0.1:8090 -listen-http 1
.1.1
.2:80"
gitlab_pages_options="-pages-domain example.io -pages-root $app_root/shared/pages -listen-proxy 127.0.0.1:8090 -listen-http 1
92.0.2
.2:80"
```
```
1.
Copy the
`gitlab-pages-ssl`
Nginx configuration file:
1.
Copy the
`gitlab-pages-ssl`
Nginx configuration file:
...
@@ -274,7 +274,7 @@ world. Custom domains are supported, but no TLS.
...
@@ -274,7 +274,7 @@ world. Custom domains are supported, but no TLS.
```
```
1.
Edit all GitLab related configs in
`/etc/nginx/site-available/`
and replace
1.
Edit all GitLab related configs in
`/etc/nginx/site-available/`
and replace
`0.0.0.0`
with
`1
.1.1.1`
, where
`1.1.1
.1`
the primary IP where GitLab
`0.0.0.0`
with
`1
92.0.2.1`
, where
`192.0.2
.1`
the primary IP where GitLab
listens to.
listens to.
1.
Restart NGINX
1.
Restart NGINX
1.
[
Restart GitLab
][
restart
]
1.
[
Restart GitLab
][
restart
]
...
@@ -320,8 +320,8 @@ world. Custom domains and TLS are supported.
...
@@ -320,8 +320,8 @@ world. Custom domains and TLS are supported.
port: 443
port: 443
https: true
https: true
external_http: 1
.1.1
.2:80
external_http: 1
92.0.2
.2:80
external_https: 1
.1.1
.2:443
external_https: 1
92.0.2
.2:443
```
```
1.
Edit
`/etc/default/gitlab`
and set
`gitlab_pages_enabled`
to
`true`
in
1.
Edit
`/etc/default/gitlab`
and set
`gitlab_pages_enabled`
to
`true`
in
...
@@ -333,7 +333,7 @@ world. Custom domains and TLS are supported.
...
@@ -333,7 +333,7 @@ world. Custom domains and TLS are supported.
```
```
gitlab_pages_enabled=true
gitlab_pages_enabled=true
gitlab_pages_options="-pages-domain example.io -pages-root $app_root/shared/pages -listen-proxy 127.0.0.1:8090 -listen-http 1
.1.1.2:80 -listen-https 1.1.1
.2:443 -root-cert /path/to/example.io.crt -root-key /path/to/example.io.key
gitlab_pages_options="-pages-domain example.io -pages-root $app_root/shared/pages -listen-proxy 127.0.0.1:8090 -listen-http 1
92.0.2.2:80 -listen-https 192.0.2
.2:443 -root-cert /path/to/example.io.crt -root-key /path/to/example.io.key
```
```
1.
Copy the
`gitlab-pages-ssl`
Nginx configuration file:
1.
Copy the
`gitlab-pages-ssl`
Nginx configuration file:
...
@@ -344,7 +344,7 @@ world. Custom domains and TLS are supported.
...
@@ -344,7 +344,7 @@ world. Custom domains and TLS are supported.
```
```
1.
Edit all GitLab related configs in
`/etc/nginx/site-available/`
and replace
1.
Edit all GitLab related configs in
`/etc/nginx/site-available/`
and replace
`0.0.0.0`
with
`1
.1.1.1`
, where
`1.1.1
.1`
the primary IP where GitLab
`0.0.0.0`
with
`1
92.0.2.1`
, where
`192.0.2
.1`
the primary IP where GitLab
listens to.
listens to.
1.
Restart NGINX
1.
Restart NGINX
1.
[
Restart GitLab
][
restart
]
1.
[
Restart GitLab
][
restart
]
...
...
doc/install/kubernetes/gitlab_omnibus.md
View file @
4022466e
...
@@ -144,7 +144,7 @@ helm install --name gitlab -f values.yaml gitlab/gitlab-omnibus
...
@@ -144,7 +144,7 @@ helm install --name gitlab -f values.yaml gitlab/gitlab-omnibus
or passing them on the command line:
or passing them on the command line:
```
bash
```
bash
helm
install
--name
gitlab
--set
baseDomain
=
gitlab.io,baseIP
=
1
.1.1
.1,gitlab
=
ee,gitlabEELicense
=
$LICENSE
,legoEmail
=
email@gitlab.com gitlab/gitlab-omnibus
helm
install
--name
gitlab
--set
baseDomain
=
gitlab.io,baseIP
=
1
92.0.2
.1,gitlab
=
ee,gitlabEELicense
=
$LICENSE
,legoEmail
=
email@gitlab.com gitlab/gitlab-omnibus
```
```
## Updating GitLab using the Helm Chart
## Updating GitLab using the Helm Chart
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment