diff options
| author | James Turnbull <james@lovedthanlost.net> | 2008-01-09 14:19:51 +1100 |
|---|---|---|
| committer | James Turnbull <james@lovedthanlost.net> | 2008-01-09 14:19:51 +1100 |
| commit | e3d4ea87fc78494e24ac8fe57ef5cf0d4e7e94ef (patch) | |
| tree | 39a4d1f40b96faf99ba14f714de2a51b95e552ea /lib/puppet/reports | |
| parent | 40addcd1920b0fa2f558c415e65ea665bac812f9 (diff) | |
| download | puppet-e3d4ea87fc78494e24ac8fe57ef5cf0d4e7e94ef.tar.gz puppet-e3d4ea87fc78494e24ac8fe57ef5cf0d4e7e94ef.tar.xz puppet-e3d4ea87fc78494e24ac8fe57ef5cf0d4e7e94ef.zip | |
Fixes ticket #993 - tagmail with smtpserver specified does not add To/From/Subject header
Diffstat (limited to 'lib/puppet/reports')
| -rw-r--r-- | lib/puppet/reports/tagmail.rb | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/lib/puppet/reports/tagmail.rb b/lib/puppet/reports/tagmail.rb index a2c973f8f..8c643fa08 100644 --- a/lib/puppet/reports/tagmail.rb +++ b/lib/puppet/reports/tagmail.rb @@ -127,7 +127,14 @@ Puppet::Reports.register_report(:tagmail) do Net::SMTP.start(Puppet[:smtpserver]) do |smtp| reports.each do |emails, messages| Puppet.info "Sending report to %s" % emails.join(", ") - smtp.send_message(messages, Puppet[:reportfrom], *emails) + smtp.open_message_stream(Puppet[:reportfrom], *emails) do |p| + p.puts "From: #{Puppet[:reportfrom]}" + p.puts "Subject: Puppet Report for %s" % self.host + p.puts "To: " + emails.join(", ") + p.puts "Date: " + Time.now.rfc2822 + p.puts + p.puts messages + end end end rescue => detail |