Fix an entry in wre.conf. Make local copying quiet now that it works, and remove duplicate exclusion code from the remote copy.

perlDreamer · perlDreamer · commit ec2586797883 · 2012-01-11T15:17:49.000-08:00
diff --git a/wre/etc/wre.conf b/wre/etc/wre.conf
@@ -106,7 +106,7 @@
             "rotations" : 3, ##Number of remote backups.
             "hostname" : "rsync.example.com",
             "user" : "rsyncuser",
-            "path" : "."
+            "remote_path" : "." ##No trailing slash for this directory
         }
     },
 
diff --git a/wre/sbin/backup.pl b/wre/sbin/backup.pl
@@ -86,7 +86,7 @@ sub backupFiles {
     my $backupDir   = $config->get("backup/path");
     foreach my $path (@{ $paths }) {
         say "rsyncing $path locally...";
-        system (qq!nice rsync -av --exclude=logs --exclude="domains/demo*" --exclude=mysqldata $path $backupDir/backup!);
+        system (qq!nice rsync -a --quiet --exclude=logs --exclude="domains/demo*" --exclude=mysqldata $path $backupDir/backup!);
     }
 }
 
@@ -126,7 +126,7 @@ sub copyToRemote {
     say "Moving new data over...";
     foreach my $path (@{ $paths }) {
         say "rsyncing $path remotely...";
-        system ("rsync -av --chmod=u+rwx --exclude=logs --exclude=mysqldata $path $ACCOUNT:$remote_path/backup");
+        system ("rsync -av --chmod=u+rwx $path $ACCOUNT:$remote_path/backup");
     }
 }
 

Original file line number	Diff line number	Diff line change
`@@ -106,7 +106,7 @@`
`106`	`106`	`"rotations" : 3, ##Number of remote backups.`
`107`	`107`	`"hostname" : "rsync.example.com",`
`108`	`108`	`"user" : "rsyncuser",`
`109`		`- "path" : "."`
	`109`	`+ "remote_path" : "." ##No trailing slash for this directory`
`110`	`110`	`}`
`111`	`111`	`},`
`112`	`112`
Original file line number	Diff line number	Diff line change
`@@ -86,7 +86,7 @@ sub backupFiles {`
`86`	`86`	`my $backupDir = $config->get("backup/path");`
`87`	`87`	`foreach my $path (@{ $paths }) {`
`88`	`88`	`say "rsyncing $path locally...";`
`89`		`- system (qq!nice rsync -av --exclude=logs --exclude="domains/demo*" --exclude=mysqldata $path $backupDir/backup!);`
	`89`	`+ system (qq!nice rsync -a --quiet --exclude=logs --exclude="domains/demo*" --exclude=mysqldata $path $backupDir/backup!);`
`90`	`90`	`}`
`91`	`91`	`}`
`92`	`92`
`@@ -126,7 +126,7 @@ sub copyToRemote {`
`126`	`126`	`say "Moving new data over...";`
`127`	`127`	`foreach my $path (@{ $paths }) {`
`128`	`128`	`say "rsyncing $path remotely...";`
`129`		`- system ("rsync -av --chmod=u+rwx --exclude=logs --exclude=mysqldata $path $ACCOUNT:$remote_path/backup");`
	`129`	`+ system ("rsync -av --chmod=u+rwx $path $ACCOUNT:$remote_path/backup");`
`130`	`130`	`}`
`131`	`131`	`}`
`132`	`132`