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
1
Merge Requests
1
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
nexedi
gitlab-ce
Commits
99c61a33
Commit
99c61a33
authored
Jan 10, 2020
by
Marcia Ramos
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'docs-patch-52' into 'master'
Improve GitLab pages docs See merge request gitlab-org/gitlab!22509
parents
db80a605
4e46986d
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
4 additions
and
4 deletions
+4
-4
doc/administration/pages/index.md
doc/administration/pages/index.md
+4
-4
No files found.
doc/administration/pages/index.md
View file @
99c61a33
...
@@ -32,11 +32,11 @@ In the case of [custom domains](#custom-domains) (but not
...
@@ -32,11 +32,11 @@ In the case of [custom domains](#custom-domains) (but not
ports
`80`
and/or
`443`
. For that reason, there is some flexibility in the way
ports
`80`
and/or
`443`
. For that reason, there is some flexibility in the way
which you can set it up:
which you can set it up:
1.
Run the Pages daemon in the same server as GitLab, listening on a secondary IP
.
-
Run the Pages daemon in the same server as GitLab, listening on a
**secondary IP**
.
1.
Run the Pages daemon in a separate server
. In that case, the
-
Run the Pages daemon in a
[
separate server
](
#running-gitlab-pages-on-a-separate-server
)
. In that case, the
[
Pages path
](
#change-storage-path
)
must also be present in the server that
[
Pages path
](
#change-storage-path
)
must also be present in the server that
the Pages daemon is installed, so you will have to share it via network.
the Pages daemon is installed, so you will have to share it via network.
1.
Run the Pages daemon in the same server as GitLab, listening on the same IP
-
Run the Pages daemon in the same server as GitLab, listening on the same IP
but on different ports. In that case, you will have to proxy the traffic with
but on different ports. In that case, you will have to proxy the traffic with
a loadbalancer. If you choose that route note that you should use TCP load
a loadbalancer. If you choose that route note that you should use TCP load
balancing for HTTPS. If you use TLS-termination (HTTPS-load balancing) the
balancing for HTTPS. If you use TLS-termination (HTTPS-load balancing) the
...
@@ -182,7 +182,7 @@ The [GitLab Pages README](https://gitlab.com/gitlab-org/gitlab-pages#caveats) ha
...
@@ -182,7 +182,7 @@ The [GitLab Pages README](https://gitlab.com/gitlab-org/gitlab-pages#caveats) ha
In addition to the wildcard domains, you can also have the option to configure
In addition to the wildcard domains, you can also have the option to configure
GitLab Pages to work with custom domains. Again, there are two options here:
GitLab Pages to work with custom domains. Again, there are two options here:
support custom domains with and without TLS certificates. The easiest setup is
support custom domains with and without TLS certificates. The easiest setup is
that without TLS certificates. In either case, you'll need a
secondary IP
. If
that without TLS certificates. In either case, you'll need a
**secondary IP**
. If
you have IPv6 as well as IPv4 addresses, you can use them both.
you have IPv6 as well as IPv4 addresses, you can use them both.
### Custom domains
### Custom domains
...
...
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