Skip to content

Commit 36dd443

Browse files
Remove sendmail from foremanctl builds (#4734)
Co-authored-by: Maximilian Kolb <mail@maximilian-kolb.de> (cherry picked from commit a0c48d2)
1 parent 20afb80 commit 36dd443

File tree

2 files changed

+13
-0
lines changed

2 files changed

+13
-0
lines changed

guides/common/modules/proc_configuring-satellite-for-outgoing-emails.adoc

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,15 +4,22 @@
44
= Configuring {ProjectServer} for outgoing emails
55

66
[role="_abstract"]
7+
ifdef::foremanctl[]
8+
To send email messages from {ProjectServer}, you can use an SMTP server.
9+
endif::[]
10+
ifndef::foremanctl[]
711
To send email messages from {ProjectServer}, you can use an SMTP server or the `sendmail` command.
812

913
:FeatureName: The `sendmail` command
1014
:FeatureAlternative: an SMTP service
1115
include::snip_deprecated-feature.adoc[]
16+
endif::[]
1217

18+
ifndef::foremanctl[]
1319
.Prerequisites
1420
* Some SMTP servers with anti-spam protection or greylisting features are known to cause problems.
1521
To set up outgoing email with such a service, install and configure an SMTP service on {ProjectServer} for relay or use the `sendmail` command.
22+
endif::[]
1623

1724
.Procedure
1825
. In the {ProjectWebUI}, navigate to *Administer* > *Settings*.
@@ -49,6 +56,7 @@ For more information, see https://support.google.com/mail/answer/185833[Sign in
4956
|SMTP port | 587 |
5057
|SMTP username | _user_@gmail.com | Use the Google account name.
5158
|====
59+
ifndef::foremanctl[]
5260
+
5361
.. The following example uses the `sendmail` command as a delivery method:
5462
+
@@ -65,6 +73,7 @@ endif::[]
6573
For more information see the *sendmail 1* man page.
6674
|Sendmail arguments | -i
6775
|====
76+
endif::[]
6877
. To send email by using an SMTP server that uses TLS authentication, also perform one of the following steps:
6978
+
7079
* Mark the CA certificate of the SMTP server as trusted.

guides/common/modules/ref_email-settings.adoc

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,11 @@
66
[role="_abstract"]
77
The email settings define how {Project} sends email notifications, including delivery method, SMTP configuration, reply addresses, and welcome email options.
88

9+
ifndef::foremanctl[]
910
:FeatureName: The `sendmail` command
1011
:FeatureAlternative: an SMTP service
1112
include::snip_deprecated-feature.adoc[]
13+
endif::[]
1214

1315
[cols="30%,30%,40%",options="header"]
1416
|====
@@ -30,8 +32,10 @@ endif::[]
3032
| *SMTP username* | | Username to use to authenticate, if required.
3133
| *SMTP password* | \\***** | Password to use to authenticate, if required.
3234
| *SMTP authentication* | none | Specify authentication type, if required.
35+
ifndef::foremanctl[]
3336
| *Sendmail arguments* | -i | Specify additional options to sendmail.
3437
Only used when the delivery method is set to sendmail.
3538
| *Sendmail location* | `/usr/sbin/sendmail` | The location of the sendmail executable.
3639
Only used when the delivery method is set to sendmail.
40+
endif::[]
3741
|====

0 commit comments

Comments
 (0)