From 3c2ebb02fa7a84e8e2c95a72b6527f4720d2c886 Mon Sep 17 00:00:00 2001 From: James Nachbar Date: Mon, 9 Nov 2015 07:47:30 -0700 Subject: [PATCH] fix unmatched quote, and allow for from address, etc. config --- attributes/default.rb | 6 +++++- templates/default/monit-rc.erb | 8 +++++++- 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/attributes/default.rb b/attributes/default.rb index f51af85..5461d3a 100644 --- a/attributes/default.rb +++ b/attributes/default.rb @@ -1 +1,5 @@ -default[:monit][:notify_emails] = false \ No newline at end of file +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" diff --git a/templates/default/monit-rc.erb b/templates/default/monit-rc.erb index 2209fe3..e12ffe9 100644 --- a/templates/default/monit-rc.erb +++ b/templates/default/monit-rc.erb @@ -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