Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-pages.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorVladimir Shushlin <vshushlin@gitlab.com>2021-01-21 12:36:05 +0300
committerVladimir Shushlin <vshushlin@gitlab.com>2021-01-21 12:36:05 +0300
commit4191fb807f4350a07cfd9b8328fbf56dad4bf13f (patch)
treecdc5202b29907778bebd62470ba7cd7947184214 /README.md
parent162330f605ab80353df7588001f4efe28bf24bdc (diff)
parentc3acce207191b9b27ef7af1344b965a83c2a6a80 (diff)
Merge branch 'etc-hosts' into 'master'
Include /etc/hosts in chroot jail See merge request gitlab-org/gitlab-pages!124
Diffstat (limited to 'README.md')
-rw-r--r--README.md4
1 files changed, 2 insertions, 2 deletions
diff --git a/README.md b/README.md
index ab2ac632..1b64287f 100644
--- a/README.md
+++ b/README.md
@@ -96,7 +96,7 @@ as.
The daemon starts listening on ports and reads certificates as root, then
re-executes itself as the specified user. When re-executing it creates a chroot jail
-containing a copy of its own binary, `/etc/resolv.conf`, and a bind mount of `pages-root`.
+containing a copy of its own binary, `/etc/hosts`, `/etc/resolv.conf`, and a bind mount of `pages-root`.
When `-artifacts-server` points to an HTTPS URL we also need a list of certificates for
the trusted Certification Authorities to copy inside the jail.
@@ -114,7 +114,7 @@ $ sudo ./gitlab-pages -listen-http ":80" -pages-root path/to/gitlab/shared/pages
#### Caveats
-The `/etc/resolv.conf` file, and any file pointed to by the `SSL_CERT_FILE`
+The `/etc/hosts` and `/etc/resolv.conf` files, and any file pointed to by the `SSL_CERT_FILE`
environment variable, will be copied into the jail. As a result, changes to
these files will not be reflected in Pages until it's restarted.