diff -Nur -x '*.orig' -x '*.rej' smeserver-rdiff-backup-0.0.1/root/etc/e-smith/db/configuration/migrate/rdiff-backup mezzanine_patched_smeserver-rdiff-backup-0.0.1/root/etc/e-smith/db/configuration/migrate/rdiff-backup --- smeserver-rdiff-backup-0.0.1/root/etc/e-smith/db/configuration/migrate/rdiff-backup 2006-05-18 14:47:50.579390556 +1000 +++ mezzanine_patched_smeserver-rdiff-backup-0.0.1/root/etc/e-smith/db/configuration/migrate/rdiff-backup 1970-01-01 10:00:00.000000000 +1000 @@ -1,7 +0,0 @@ -{ - my $backup_path = $DB->get_prop_and_delete('rdiff-backup', 'BackupPath'); - - return unless $backup_path; - - $DB->set_prop('rdiff-backup', 'LocalPath', $backup_path); -} diff -Nur -x '*.orig' -x '*.rej' smeserver-rdiff-backup-0.0.1/root/etc/e-smith/db/configuration/migrate/rdiff-backup-path mezzanine_patched_smeserver-rdiff-backup-0.0.1/root/etc/e-smith/db/configuration/migrate/rdiff-backup-path --- smeserver-rdiff-backup-0.0.1/root/etc/e-smith/db/configuration/migrate/rdiff-backup-path 1970-01-01 10:00:00.000000000 +1000 +++ mezzanine_patched_smeserver-rdiff-backup-0.0.1/root/etc/e-smith/db/configuration/migrate/rdiff-backup-path 2006-05-18 14:35:04.150506143 +1000 @@ -0,0 +1,7 @@ +{ + my $backup_path = $DB->get_prop_and_delete('rdiff-backup', 'BackupPath'); + + return unless $backup_path; + + $DB->set_prop('rdiff-backup', 'LocalPath', $backup_path); +} diff -Nur -x '*.orig' -x '*.rej' smeserver-rdiff-backup-0.0.1/root/etc/e-smith/db/configuration/migrate/rdiff-backup-time mezzanine_patched_smeserver-rdiff-backup-0.0.1/root/etc/e-smith/db/configuration/migrate/rdiff-backup-time --- smeserver-rdiff-backup-0.0.1/root/etc/e-smith/db/configuration/migrate/rdiff-backup-time 1970-01-01 10:00:00.000000000 +1000 +++ mezzanine_patched_smeserver-rdiff-backup-0.0.1/root/etc/e-smith/db/configuration/migrate/rdiff-backup-time 2006-05-18 14:44:53.971061685 +1000 @@ -0,0 +1,11 @@ +{ + my $rdiff_rec = $DB->get('rdiff-backup') + || $DB->new_record('rdiff-backup', {type => 'service'}); + + my %props = $rdiff_rec->props(); + + $props{Hour} ||= int(rand(7)); # Early in the morning + $props{Minute} ||= int(rand(60)); + + $rdiff_rec->merge_props(%props); +} diff -Nur -x '*.orig' -x '*.rej' smeserver-rdiff-backup-0.0.1/root/etc/e-smith/templates/etc/crontab/rdiff-backup mezzanine_patched_smeserver-rdiff-backup-0.0.1/root/etc/e-smith/templates/etc/crontab/rdiff-backup --- smeserver-rdiff-backup-0.0.1/root/etc/e-smith/templates/etc/crontab/rdiff-backup 2006-04-25 22:52:41.000000000 +1000 +++ mezzanine_patched_smeserver-rdiff-backup-0.0.1/root/etc/e-smith/templates/etc/crontab/rdiff-backup 2006-05-18 14:47:02.654713359 +1000 @@ -2,5 +2,8 @@ return "# rdiff-backup disabled" unless ${'rdiff-backup'}{status} eq 'enabled'; - return '5 1 * * * root /sbin/e-smith/do_rdiff-backup'; + my $hour = ${'rdiff-backup'}{Hour} || 1; + my $minute = ${'rdiff-backup'}{Minute} || 5; + + return "$minute $hour * * * root /sbin/e-smith/do_rdiff-backup"; }