Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Document smtp_hello parameter #988

Merged
merged 2 commits into from
Mar 16, 2018
Merged
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Next Next commit
Document smtp_hello parameter
  • Loading branch information
simonpasquier committed Mar 16, 2018
commit e6fcc69ec33ee8aa8000b21ac77bf63d473814fa
5 changes: 5 additions & 0 deletions content/docs/alerting/configuration.md
Original file line number Diff line number Diff line change
Expand Up @@ -65,6 +65,8 @@ global:
[ smtp_from: <tmpl_string> ]
# The default SMTP smarthost used for sending emails.
[ smtp_smarthost: <string> ]
# The default hostname to identify to the SMTP server.
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think we should mention the default behaviour of using localhost here somehow.

[ smtp_hello: <string> | default = "localhost" ]
# SMTP authentication information.
[ smtp_auth_username: <string> ]
[ smtp_auth_password: <secret> ]
Expand Down Expand Up @@ -290,6 +292,9 @@ to: <tmpl_string>
# The SMTP host through which emails are sent.
[ smarthost: <string> | default = global.smtp_smarthost ]

# The hostname to identify to the SMTP server.
[ hello: <string> | default = global.smtp_hello ]

# SMTP authentication information.
[ auth_username: <string> | default = global.smtp_auth_username ]
[ auth_password: <secret> | default = global.smtp_auth_password ]
Expand Down