[Bobs-cvs] CVS: bobs systemcheck.php,1.5,1.6

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

Update of /cvsroot/bobs/bobs
In directory sc8-pr-cvs1:/tmp/cvs-serv24810

Modified Files:
	systemcheck.php 
Log Message:
Don't create mount directories for rsync method.
Use ip address if specified.


Index: systemcheck.php
===================================================================
RCS file: /cvsroot/bobs/bobs/systemcheck.php,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- systemcheck.php	4 Jan 2004 03:45:22 -0000	1.5
+++ systemcheck.php	20 Jan 2004 04:14:47 -0000	1.6
@@ -401,9 +401,12 @@
     // If backup has not been run on this server,
     // the mount directory will not exist.
     // Create it now so I can test if the mounts and stuff work.
+    // Don't need it if backup method is rsync or rcync_ssh so don't create it.
 
+    $config = $srvcfg->get_config();
+    $method = $config['backup_method'];
     $mountdir=$srvcfg->get_mount_dir();
-    if (! is_dir($mountdir)){
+    if (! is_dir($mountdir) && ($method != "rsync") && ($method != "rsync_ssh")){
         $t->assign ('ITEM', "It appears $server/$share hasn't been backed up.<br>
                 I will attempt to create the mount directories needed to
                 continue these tests.");
@@ -517,8 +520,14 @@
     // Test rsync over ssh
 
     if ($method == "rsync_ssh"){
+    	$server_ip = $config['server_ip'];
+	if ($server_ip != ''){
+		$server_or_ip = $server_ip;
+	} else {
+		$server_or_ip = $server;
+	}
         $rsync_ssh_path = $config['rsync_ssh_path'];
-        $rsync = "rsync -n -e ssh " . $server . ':' . $rsync_ssh_path;
+        $rsync = "rsync -n -e ssh " . $server_or_ip . ':' . $rsync_ssh_path;
         $t->assign ('ITEM', "Testing rsync over ssh for backup method \"$method\" using this command:<br>
             $rsync");
         $srvtmpl->assign ('COMMAND', "$rsync");        // the mount command