Skip to content
Snippets Groups Projects
Commit 7b2e21ee authored by Amy Qualls's avatar Amy Qualls
Browse files

Merge branch 'docs-bbodenmiller-master-patch-33086' into 'master'

List Postfix mail option

See merge request gitlab-org/omnibus-gitlab!5813
parents fe667bd4 3e5c825e
No related branches found
No related tags found
2 merge requests!65heptapod#658: intermediate release to test the shift,!64GitLab 14.8
......@@ -103,6 +103,7 @@
"OpenID",
"OpenShift",
"PgBouncer",
"Postfix",
"PostgreSQL",
"Praefect",
"Prometheus",
......@@ -117,6 +118,7 @@
"runit",
"Salesforce",
"SAML",
"Sendmail",
"Sentry",
"Sidekiq",
"Shibboleth",
......
......@@ -18,7 +18,7 @@
Container Registry which can have their own subdomains requires certificates for
those subdomains also.)
- If you want to send notification emails, install and configure a mail server (MTA)
like sendmail. Alternatively, you can use other [third party SMTP servers](../settings/smtp.md).
like Sendmail or Postfix. Alternatively, you can use other [third party SMTP servers](../settings/smtp.md).
## Installation and Configuration
......@@ -32,7 +32,7 @@
- [Enabling HTTPS](../settings/nginx.md#enable-https).
- [Enabling notification emails](../settings/smtp.md#smtp-settings).
- [Enabling replying via email](https://docs.gitlab.com/ee/administration/reply_by_email.html#set-it-up).
- [Installing and configuring postfix](https://docs.gitlab.com/ee/administration/reply_by_email_postfix_setup.html).
- [Installing and configuring Postfix](https://docs.gitlab.com/ee/administration/reply_by_email_postfix_setup.html).
- [Enabling container registry on GitLab](https://docs.gitlab.com/ee/administration/packages/container_registry.html#container-registry-domain-configuration).
- You require SSL certificates for the domain used for container registry.
- [Enabling GitLab Pages](https://docs.gitlab.com/ee/administration/pages/).
......
......@@ -7,7 +7,7 @@
# SMTP settings **(FREE SELF)**
If you would rather send application email via an SMTP server instead of via
Sendmail, add the following configuration information to
Sendmail or Postfix, add the following configuration information to
`/etc/gitlab/gitlab.rb` and run `gitlab-ctl reconfigure`.
WARNING:
......
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