[Bobs-cvs] CVS: bobs/cron backup.php.in,1.6,1.7

[Joe Z. <jz...@us...>]

Update of /cvsroot/bobs/bobs/cron
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv21371/cron

Modified Files:
	backup.php.in 
Log Message:
Remove old incremental files and directories during daily backup.


Index: backup.php.in
===================================================================
RCS file: /cvsroot/bobs/bobs/cron/backup.php.in,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- backup.php.in	5 Feb 2003 02:05:22 -0000	1.6
+++ backup.php.in	23 May 2004 21:25:37 -0000	1.7
@@ -5,11 +5,13 @@
 // Can't get siteroot from class_config because this file
 // is in a cron directory, not the bobs site root.
 
-$siteroot = '@myrealWEBDIR@';                        
+$siteroot = '@myrealWEBDIR@';
 
 require($siteroot . '/inc/class_config.php');
 require($siteroot . '/inc/class_server.php');
 require($siteroot . '/inc/class_backup.php');
+require($siteroot . '/inc/class_db.php');
+require($siteroot . '/inc/class_cleanup.php');
 require($siteroot . '/inc/config.php');
 require($siteroot . '/inc/class_rfasttemplate.php');
 
@@ -21,36 +23,45 @@
 
 // for each config do a backup if needed (defined in the config)
 foreach ($srvcfg->servers as $server ) {
-	// set the config we are working on
-	$current = $srvcfg->set_config($server[server] . '.' . $server[share]);
+  // set the config we are working on
+  $current = $srvcfg->set_config($server[server] . '.' . $server[share]);
 
-// include some checks to see if a server.share should be backup in this instance
+  // include some checks to see if a server.share should be backup in this instance
 
-	// check if we are on a backup day
-	$day = $srvcfg->check_day();
-	$active = $srvcfg->check_active();
+  // check if we are on a backup day
+  $day = $srvcfg->check_day();
+  $active = $srvcfg->check_active();
 
-	if ( $day == "ok" && $active == "ok") {
-		// now we should create a new backup object
-		$backup = new backup($sys_conf, $srvcfg->config);
+  if ( $day == "ok" && $active == "ok") {
+    // now we should create a new backup object
+    $backup = new backup($sys_conf, $srvcfg->config);
 
-		// check if the dirs we need exists
-		$backup->dir_check();
-	
-		// do backup
-		$backup->server_backup();
+    // check if the dirs we need exists
+    $backup->dir_check();
 
-		// increment files
-		$backup->increment_files();
+    // do backup
+    $backup->server_backup();
 
-		// generate indexes
-		$backup->server_create_index();
+    // increment files
+    $backup->increment_files();
 
-		unset($backup);
-	}
+    // generate indexes
+    $backup->server_create_index();
 
-}
+    // create a new cleanup object
+    $backup_config = $backup->get_config();
+    $retention_days = $srvcfg->get_incrementals();
+    $cleanup = new cleanup($backup_config, $retention_days);
+    print "Incremental cleanup retention days: $retention_days\n";
 
+    // Delete old incremental files and dirs
+    $cleanup->delete_files();
+    $cleanup->delete_dirs();
+
+    unset($cleanup);
+    unset($backup);
+  }
 
+}
 
 ?>