1 |
diff -Nur -x '*.orig' -x '*.rej' e-smith-backup-1.15.0/root/etc/e-smith/locale/en-us/etc/e-smith/web/functions/backup mezzanine_patched_e-smith-backup-1.15.0/root/etc/e-smith/locale/en-us/etc/e-smith/web/functions/backup |
2 |
--- e-smith-backup-1.15.0/root/etc/e-smith/locale/en-us/etc/e-smith/web/functions/backup 2008-03-08 19:18:52.000000000 +1100 |
3 |
+++ mezzanine_patched_e-smith-backup-1.15.0/root/etc/e-smith/locale/en-us/etc/e-smith/web/functions/backup 2008-03-08 19:13:54.000000000 +1100 |
4 |
@@ -7,6 +7,34 @@ |
5 |
<base>BACKUP_DESC</base> |
6 |
<trans> |
7 |
<![CDATA[ |
8 |
+ <P>The server provides two ways to back up and restore |
9 |
+ your server: using your local desktop or a tape drive.</P> |
10 |
+ |
11 |
+ <P>The first method creates a copy of your server configuration and user |
12 |
+ data files, and downloads it to your local desktop via your web browser. |
13 |
+ Currently your configuration and data files total approximately |
14 |
+ <b>$tarsize</b>. The backup file will be somewhat less than this, |
15 |
+ depending on how compressible the data are. The \"Verify desktop backup |
16 |
+ file\" option can be used to check the integrity of a desktop backup |
17 |
+ file.</P> |
18 |
+ |
19 |
+ <P>The tape backup method uses a software package called <I>$module</I> |
20 |
+ to back up your entire hard disk to tape every night. This requires a |
21 |
+ supported tape drive and a tape that is not write-protected. The backup |
22 |
+ is performed automatically at the selected time every night (with a |
23 |
+ reminder automatically e-mailed to the administrator during the day). |
24 |
+ Currently your hard disk contains <b>$dumpsize</b> of data.</P> |
25 |
+ |
26 |
+ <P>Both restore methods allow you to restore your configuration and user |
27 |
+ data files. <b>Ideally, the restore should be performed on a freshly |
28 |
+ installed server</b>.</P> |
29 |
+ ]]> |
30 |
+ </trans> |
31 |
+ </entry> |
32 |
+ <entry> |
33 |
+ <base>BACKUP_DESC_DAR</base> |
34 |
+ <trans> |
35 |
+ <![CDATA[ |
36 |
<P>The server provides three ways to back up and restore |
37 |
your server: using your local desktop, a tape drive or a |
38 |
workstation on your LAN.</P> |
39 |
diff -Nur -x '*.orig' -x '*.rej' e-smith-backup-1.15.0/root/etc/e-smith/web/functions/backup mezzanine_patched_e-smith-backup-1.15.0/root/etc/e-smith/web/functions/backup |
40 |
--- e-smith-backup-1.15.0/root/etc/e-smith/web/functions/backup 2008-03-08 19:18:52.000000000 +1100 |
41 |
+++ mezzanine_patched_e-smith-backup-1.15.0/root/etc/e-smith/web/functions/backup 2008-03-08 19:15:58.000000000 +1100 |
42 |
@@ -173,7 +173,7 @@ |
43 |
} |
44 |
|
45 |
# Hack to evaluate embedded vars |
46 |
- print eval 'return "'.$fm->localise('BACKUP_DESC').'\n";'; |
47 |
+ print eval 'return "'.$fm->localise('BACKUP_DESC_DAR').'\n";'; |
48 |
|
49 |
if ($tarsize =~ /Tb/ or $tarsize =~ /(\d+)Gb/ and $1 >= 2) |
50 |
{ |