Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
omnibus-heptapod
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Container Registry
Model registry
Operate
Environments
Monitor
Incidents
Service Desk
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Terms and privacy
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
heptapod
omnibus-heptapod
Commits
f51ef6f2ad7b
Commit
f51ef6f2ad7b
authored
1 year ago
by
GitLab Bot
Browse files
Options
Downloads
Plain Diff
Automatic merge of gitlab-org/omnibus-gitlab master
parents
971bfed15cd8
9e62d61d83a8
Loading
Loading
1 merge request
!100
Upstream Merge of 16.1 CE branching point
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
doc/architecture/index.md
+2
-2
2 additions, 2 deletions
doc/architecture/index.md
doc/settings/database.md
+4
-4
4 additions, 4 deletions
doc/settings/database.md
with
6 additions
and
6 deletions
doc/architecture/index.md
+
2
−
2
View file @
f51ef6f2
...
...
@@ -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
...
...
This diff is collapsed.
Click to expand it.
doc/settings/database.md
+
4
−
4
View file @
f51ef6f2
...
...
@@ -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:
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment