[icinga-checkins] icinga.org: icinga2/next: Add (s) smtp_mail_from option to smtp and ssmtp commands.

git at icinga.org git at icinga.org
Mon Jun 16 08:57:49 CEST 2014


Module: icinga2
Branch: next
Commit: 444a85ddd062e5d5a176ee3f3cfd70866ad576ea
URL:    https://git.icinga.org/?p=icinga2.git;a=commit;h=444a85ddd062e5d5a176ee3f3cfd70866ad576ea

Author: Gerd von Egidy <gerd at egidy.de>
Date:   Sun Jun 15 21:55:06 2014 +0200

Add (s)smtp_mail_from option to smtp and ssmtp commands.

Refs #6487

---

 doc/6-configuring-icinga-2.md |    2 ++
 itl/command-plugins.conf      |    2 ++
 2 files changed, 4 insertions(+)

diff --git a/doc/6-configuring-icinga-2.md b/doc/6-configuring-icinga-2.md
index 5dfdb0d..bc7bf0d 100644
--- a/doc/6-configuring-icinga-2.md
+++ b/doc/6-configuring-icinga-2.md
@@ -1881,6 +1881,7 @@ Custom Attributes:
 Name                 | Description
 ---------------------|--------------
 smtp_address         | **Optional.** The host's address. Defaults to "$address$".
+smtp_mail_from       | **Optional.** Test a MAIL FROM command with the given email address.
 
 #### <a id="plugin-check-command-ssmtp"></a> ssmtp
 
@@ -1892,6 +1893,7 @@ Name            | Description
 ----------------|--------------
 ssmtp_address   | **Required.** The host's address. Defaults to "$address$".
 ssmtp_port      | **Optional.** The port that should be checked. Defaults to 465.
+ssmtp_mail_from | **Optional.** Test a MAIL FROM command with the given email address.
 
 #### <a id="plugin-check-command-imap"></a> imap
 
diff --git a/itl/command-plugins.conf b/itl/command-plugins.conf
index 0aca02e..777ab0b 100644
--- a/itl/command-plugins.conf
+++ b/itl/command-plugins.conf
@@ -152,6 +152,7 @@ object CheckCommand "smtp" {
 
 	arguments = {
 		"-H" = "$smtp_address$"
+		"-f" = "$smtp_mail_from$"
 	}
 
 	vars.smtp_address = "$address$"
@@ -165,6 +166,7 @@ object CheckCommand "ssmtp" {
 	arguments = {
 		"-H" = "$ssmtp_address$"
 		"-p" = "$ssmtp_port$"
+		"-f" = "$ssmtp_mail_from$"
 	}
 
 	vars.ssmtp_address = "$address$"



More information about the icinga-checkins mailing list