From 33e32d29166967827a2adb9ec9ebfd0b54fe10f7 Mon Sep 17 00:00:00 2001 From: Mercier Pierre-Olivier Date: Thu, 14 Nov 2013 16:03:30 +0100 Subject: [PATCH 1/3] Add charset to sended log email --- ACU/Log.pm | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/ACU/Log.pm b/ACU/Log.pm index 11210d9..64c4bdc 100644 --- a/ACU/Log.pm +++ b/ACU/Log.pm @@ -4,6 +4,10 @@ use v5.10.1; use strict; use warnings; use Carp; +use utf8; +use open IO => ':utf8'; +use open ':std'; + use Data::Dumper; use Email::MIME; use Exporter 'import'; @@ -74,6 +78,11 @@ sub log To => "Roots assistants ", Subject => "[LERDORF][ERROR] ".join(' ', @_) ], + attributes => { + encoding => 'quoted-printable', + charset => 'utf-8', + format => 'flowed', + }, body_str => "Bonjour, Une erreur de niveau $level est survenue sur la machine $HOSTNAME. From 947aebd490d12498769d9b9b26a628f9c83f5c15 Mon Sep 17 00:00:00 2001 From: Mercier Pierre-Olivier Date: Thu, 14 Nov 2013 16:09:24 +0100 Subject: [PATCH 2/3] Add sendmail option --- ACU/Log.pm | 2 +- utils/lpt | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/ACU/Log.pm b/ACU/Log.pm index 64c4bdc..5d751b8 100644 --- a/ACU/Log.pm +++ b/ACU/Log.pm @@ -71,7 +71,7 @@ sub log if ($mail_error && $level <= ERROR) { - require Email::Sender::Simple; + require Email::Sender::Simple qw(sendmail); my $mail = Email::MIME->create( header_str => [ From => "Roots assistants ", diff --git a/utils/lpt b/utils/lpt index a3b205f..78e3763 100755 --- a/utils/lpt +++ b/utils/lpt @@ -1512,7 +1512,7 @@ sub cmd_no_strong_auth_view(@) sub cmd_no_strong_auth_warn(@) { - require Email::Sender::Simple; + require Email::Sender::Simple qw(sendmail); for my $entry (get_no_strong_auth_user()) { @@ -1553,7 +1553,7 @@ Les roots ACU"; sub cmd_no_strong_auth_close(@) { - require Email::Sender::Simple; + require Email::Sender::Simple qw(sendmail); for my $entry (get_no_strong_auth_user()) { @@ -1706,7 +1706,7 @@ sub cmd_ssh_keys_without_passphrase_view(@) # warn about unprotected keys sub cmd_ssh_keys_without_passphrase_warn(@) { - require Email::Sender::Simple; + require Email::Sender::Simple qw(sendmail); my $process = sub() { my $entry = shift; @@ -1760,7 +1760,7 @@ Les roots ACU"; # remove unprotected keys sub cmd_ssh_keys_without_passphrase_remove(@) { - require Email::Sender::Simple; + require Email::Sender::Simple qw(sendmail); my $process = sub() { my $entry = shift; From 5247d4db535bef903efa8ab3faf0c873c99ab6c8 Mon Sep 17 00:00:00 2001 From: Mercier Pierre-Olivier Date: Thu, 14 Nov 2013 16:20:13 +0100 Subject: [PATCH 3/3] Add sendmail option --- ACU/Log.pm | 3 ++- utils/lpt | 12 ++++++++---- 2 files changed, 10 insertions(+), 5 deletions(-) diff --git a/ACU/Log.pm b/ACU/Log.pm index 5d751b8..491df18 100644 --- a/ACU/Log.pm +++ b/ACU/Log.pm @@ -71,7 +71,8 @@ sub log if ($mail_error && $level <= ERROR) { - require Email::Sender::Simple qw(sendmail); + require Email::Sender::Simple; + Email::Sender::Simple->import(qw(sendmail)); my $mail = Email::MIME->create( header_str => [ From => "Roots assistants ", diff --git a/utils/lpt b/utils/lpt index 78e3763..ea342b0 100755 --- a/utils/lpt +++ b/utils/lpt @@ -1512,7 +1512,8 @@ sub cmd_no_strong_auth_view(@) sub cmd_no_strong_auth_warn(@) { - require Email::Sender::Simple qw(sendmail); + require Email::Sender::Simple; + Email::Sender::Simple->import(qw(sendmail)); for my $entry (get_no_strong_auth_user()) { @@ -1553,7 +1554,8 @@ Les roots ACU"; sub cmd_no_strong_auth_close(@) { - require Email::Sender::Simple qw(sendmail); + require Email::Sender::Simple; + Email::Sender::Simple->import(qw(sendmail)); for my $entry (get_no_strong_auth_user()) { @@ -1706,7 +1708,8 @@ sub cmd_ssh_keys_without_passphrase_view(@) # warn about unprotected keys sub cmd_ssh_keys_without_passphrase_warn(@) { - require Email::Sender::Simple qw(sendmail); + require Email::Sender::Simple; + Email::Sender::Simple->import(qw(sendmail)); my $process = sub() { my $entry = shift; @@ -1760,7 +1763,8 @@ Les roots ACU"; # remove unprotected keys sub cmd_ssh_keys_without_passphrase_remove(@) { - require Email::Sender::Simple qw(sendmail); + require Email::Sender::Simple; + Email::Sender::Simple->import(qw(sendmail)); my $process = sub() { my $entry = shift;