1 |
wellsi |
1.1 |
diff -ruN e-smith-backup-2.2.0.old/root/etc/e-smith/events/actions/workstation-backup-dar e-smith-backup-2.2.0/root/etc/e-smith/events/actions/workstation-backup-dar |
2 |
|
|
--- e-smith-backup-2.2.0.old/root/etc/e-smith/events/actions/workstation-backup-dar 2011-12-30 00:25:30.000000000 +0000 |
3 |
|
|
+++ e-smith-backup-2.2.0/root/etc/e-smith/events/actions/workstation-backup-dar 2011-12-30 03:28:27.000000000 +0000 |
4 |
|
|
@@ -77,10 +77,12 @@ |
5 |
|
|
my $fullday = $backupwk->prop('FullDay') || 7; |
6 |
|
|
my $mail = $backupwk->prop('MailNotify') || 'yes'; |
7 |
|
|
my $mntdir = $backupwk->prop('Mount') || '/mnt/smb'; |
8 |
|
|
+my $frommail = $backupwk->prop('FromMail') || 'admin-backup'; |
9 |
|
|
+my $tomail = $backupwk->prop('ToMail') || 'admin'; |
10 |
|
|
my $tmpdir; |
11 |
|
|
|
12 |
|
|
-$report .= "From: admin-backup\n"; |
13 |
|
|
-$report .= "To: admin\n"; |
14 |
|
|
+$report .= "From: ".$frommail."\n"; |
15 |
|
|
+$report .= "To: $tomail\n"; |
16 |
|
|
$report .= "Subject: Daily Backup Report: ".$id."\n\n"; |
17 |
|
|
$report .= "================================== \n"; |
18 |
|
|
$report .= "DAILY BACKUP TO WORKSTATION REPORT \n"; |
19 |
|
|
@@ -341,7 +343,7 @@ |
20 |
|
|
|
21 |
|
|
if ($mail eq 'yes') |
22 |
|
|
{ |
23 |
|
|
- open (MAIL, "|/var/qmail/bin/qmail-inject -a admin") |
24 |
|
|
+ open (MAIL, "|/var/qmail/bin/qmail-inject") |
25 |
|
|
|| die "Cannot start mail program: $!\n"; |
26 |
|
|
print MAIL $report; |
27 |
|
|
close(MAIL); |
28 |
|
|
@@ -357,7 +359,7 @@ |
29 |
|
|
$report .= $errmsg; |
30 |
|
|
if (($mail eq 'yes') || ($mail eq 'error')) |
31 |
|
|
{ |
32 |
|
|
- open (MAIL, "|/var/qmail/bin/qmail-inject -a admin") |
33 |
|
|
+ open (MAIL, "|/var/qmail/bin/qmail-inject") |
34 |
|
|
|| die "Cannot start mail program: $!: message was $errmsg\n"; |
35 |
|
|
print MAIL $report; |
36 |
|
|
close(MAIL); |