Skip to content
Snippets Groups Projects
Commit f51ef6f2ad7b authored by GitLab Bot's avatar GitLab Bot
Browse files

Automatic merge of gitlab-org/omnibus-gitlab master

1 merge request!100Upstream Merge of 16.1 CE branching point
......@@ -40,7 +40,7 @@
### Individual software definitions
Omnibus GitLab follows a batteries-included style of distribution. All of the
software, libraries, and binaries necessary for the proper functioning of
software, libraries, and binaries necessary for the proper functioning of
a GitLab instance is provided as part of the package, in an embedded format.
So another one of the major components of the omnibus architecture is the
......@@ -148,7 +148,7 @@
### runit
GitLab uses [runit](http://smarden.org/runit/) recipes for
GitLab uses [runit](http://smarden.org/runit/) recipes for
service management and supervision. runit recipes do the job of identifying the
init system used by the OS and performing basic service management tasks like
creating necessary service files for GitLab, service enabling, and service
......
......@@ -100,10 +100,10 @@
is `gitlab.example.com`. You will either need a wildcard certificate for
`*.example.com` or two different SSL certificates.
The `ssl_cert_file`, `ssl_key_file`, and `ssl_ca_file` files direct PostgreSQL to where
on the filesystem to find the certificate, key, and bundle. These changes are applied to
`postgresql.conf`. The directives `internal_certificate` and `internal_key` are used to
populate the contents of these files. The contents can be added directly or
The `ssl_cert_file`, `ssl_key_file`, and `ssl_ca_file` files direct PostgreSQL to where
on the filesystem to find the certificate, key, and bundle. These changes are applied to
`postgresql.conf`. The directives `internal_certificate` and `internal_key` are used to
populate the contents of these files. The contents can be added directly or
loaded from file as shown in the following example.
After you have these files, enable SSL:
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment