diff --git a/.markdownlint.yml b/.markdownlint.yml index fe0d5c135636c047b4711bcb1ab5803326e02c08_Lm1hcmtkb3dubGludC55bWw=..3e5c825ea56720fced9f8c02c779d6a4d2624da2_Lm1hcmtkb3dubGludC55bWw= 100644 --- a/.markdownlint.yml +++ b/.markdownlint.yml @@ -103,6 +103,7 @@ "OpenID", "OpenShift", "PgBouncer", + "Postfix", "PostgreSQL", "Praefect", "Prometheus", @@ -117,6 +118,7 @@ "runit", "Salesforce", "SAML", + "Sendmail", "Sentry", "Sidekiq", "Shibboleth", diff --git a/doc/installation/index.md b/doc/installation/index.md index fe0d5c135636c047b4711bcb1ab5803326e02c08_ZG9jL2luc3RhbGxhdGlvbi9pbmRleC5tZA==..3e5c825ea56720fced9f8c02c779d6a4d2624da2_ZG9jL2luc3RhbGxhdGlvbi9pbmRleC5tZA== 100644 --- a/doc/installation/index.md +++ b/doc/installation/index.md @@ -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/). diff --git a/doc/settings/smtp.md b/doc/settings/smtp.md index fe0d5c135636c047b4711bcb1ab5803326e02c08_ZG9jL3NldHRpbmdzL3NtdHAubWQ=..3e5c825ea56720fced9f8c02c779d6a4d2624da2_ZG9jL3NldHRpbmdzL3NtdHAubWQ= 100644 --- a/doc/settings/smtp.md +++ b/doc/settings/smtp.md @@ -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: