Changeset 1028

Timestamp:

03/03/09 02:14:32 (3 years ago)

Author:

strat.cristian@…

Message:

fixes for mirror-backup

File:

• trunk/scripts/mirror-backup (modified) (4 diffs)

trunk/scripts/mirror-backup

@@ -8 +8 @@
 define("IA_BACKUP_SSL_CERT", "$home_dir/.ssh/ia-backup");
 
+function week_timestamp() {
+    return date("YW");
+}
+
 function check_env() {
     log_assert(is_dir(IA_BACKUP_REPO_DIR));
@@ -14 +18 @@
 }
 
-function exec_rsync($source_dir, $target_dir) {
+function exec_rsync($source_dir, $target_dir, $delete_extraneous=false) {
     log_print("rsync $source_dir -> $target_dir");
-    $cmd = sprintf("rsync -avC --delete --rsh='ssh -p 21883 -i %s' "
+    $delete_arg = $delete_extraneous ? '--delete' : '';
+    $cmd = sprintf("rsync -avC {$delete_arg} --rsh='ssh -p 21883 -i %s' "
             ."backup@infoarena.ro:%s %s/%s", IA_BACKUP_SSL_CERT, $source_dir,
             IA_BACKUP_REPO_DIR, $target_dir);
@@ -23 +28 @@
 
 function sync_attachments() {
-    $new_snapshot = backup_timestamp();
+    $new_snapshot = week_timestamp();
     if (!is_dir(IA_BACKUP_REPO_DIR."/attach")) {
         mkdir(IA_BACKUP_REPO_DIR."/attach");
     }
-    $last_snapshot = exec(sprintf("ls -tr1 '%s'",
+    $last_snapshot = exec(sprintf("ls -1 '%s'",
             IA_BACKUP_REPO_DIR."/attach"));
     if ($last_snapshot && $last_snapshot != $new_snapshot) {
@@ -37 +42 @@
     }
     log_print("Syncing last snapshot");
-    exec_rsync('attach-live/', "attach/$new_snapshot/");
+    exec_rsync('attach-live/', "attach/$new_snapshot/", true);
 }