Skip to content

fix unmatched quote, and allow for from address, etc. config #4

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.

Sign up for GitHub

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

Open
nachbar wants to merge 1 commit into
base: master
Choose a base branch
from
Open

fix unmatched quote, and allow for from address, etc. config #4

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
6 changes: 5 additions & 1 deletion attributes/default.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1,5 @@
default[:monit][:notify_emails] = false
default[:monit][:notify_emails] = false
default[:monit][:mailserver][:emailfrom] = "emailfrom@example.com"
default[:monit][:mailserver][:emailreplyto] = "emailreplyto@example.com"
default[:monit][:mailserver][:emailsubject] = "$SERVICE $EVENT at $DATE"
default[:monit][:mailserver][:emailmessage] = "Monit $ACTION $SERVICE at $DATE on $HOST: $DESCRIPTION.\nYours sincerely,\nmonit"
8 changes: 7 additions & 1 deletion templates/default/monit-rc.erb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,13 +15,19 @@ set alert <%= email %>
<% end %>

<% if node[:monit][:mailserver] %>
set mailserver "<%= node[:monit][:mailserver][:host] %>' port <%= node[:monit][:mailserver][:port] %>"
set mailserver "<%= node[:monit][:mailserver][:host] %>" port <%= node[:monit][:mailserver][:port] %>
username "<%= node[:monit][:mailserver][:username] %>"
password "<%= node[:monit][:mailserver][:password] %>"
using tlsv1
with timeout 30 seconds
using hostname "<%= node[:monit][:mailserver][:hostname] %>"
<% end %>
set mail-format {
<% if node[:monit][:mailserver][:emailfrom] %> from: <%= node[:monit][:mailserver][:emailfrom] %> <% end %>
<% if node[:monit][:mailserver][:emailreplyto] %> reply-to: <%= node[:monit][:mailserver][:emailreplyto] %> <% end %>
<% if node[:monit][:mailserver][:emailsubject] %> subject: "<%= node[:monit][:mailserver][:emailsubject] %>" <% end %>
<% if node[:monit][:mailserver][:emailmessage] %> message: "<%= node[:monit][:mailserver][:emailmessage] %>" <% end %>
}
<% end %>

set httpd port 2812 and
Expand Down