Magellan Linux

Diff of /alx-src/branches/alx-web-050/index.php

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

revision 1607 by niro, Thu Dec 2 19:56:40 2010 UTC revision 1608 by niro, Thu Dec 2 22:13:04 2010 UTC
# Line 27  Line 27 
27   if(!isset($comps[$dat['serial']])) return false;   if(!isset($comps[$dat['serial']])) return false;
28    
29   //passthru("/bin/ping -I eth0 -c 1 -W 1 -q ".$dat['ip']." &> /dev/null && exit 0 || exit 1",$retval);   //passthru("/bin/ping -I eth0 -c 1 -W 1 -q ".$dat['ip']." &> /dev/null && exit 0 || exit 1",$retval);
30   passthru("/usr/sbin/fping -c 1 -t 50 -q ".$dat['ip']." &> /dev/null && exit 0 || exit 1",$retval);   passthru($pingcmd." ".$dat['ip']." &> /dev/null && exit 0 || exit 1",$retval);
31   if($retval==0)   if($retval==0)
32   {   {
33   $comps[$dat['serial']]['online'] = true;   $comps[$dat['serial']]['online'] = true;
# Line 136  Line 136 
136   {   {
137   $pubkey = mysql_query('select public_key from ssh_auth_clients where serial='.$c['serial'].'');   $pubkey = mysql_query('select public_key from ssh_auth_clients where serial='.$c['serial'].'');
138   while ($row = mysql_fetch_row ($pubkey)) {   while ($row = mysql_fetch_row ($pubkey)) {
  $sshcmd = "/usr/bin/ssh";  
  $home = "/var/www";  
139    
140   # schreiben der .ssh/known_hosts file mit dem public rsa key des client,   # schreiben der .ssh/known_hosts file mit dem public rsa key des client,
141   # um die "yes" abfrage zu vermeiden   # um die "yes" abfrage zu vermeiden
# Line 145  Line 143 
143   fwrite($hostfile,$c['ip']." ".$row[0],strlen($row[0])+strlen($c['ip'])+1);   fwrite($hostfile,$c['ip']." ".$row[0],strlen($row[0])+strlen($c['ip'])+1);
144   fclose($hostfile);   fclose($hostfile);
145    
146   $osver = exec($sshcmd.' -l root '.$c['ip'].' \'os_ver=$(</etc/mageversion);cfg_ver=$(/sbin/magequery -n alxconfig-ng-alx|cut -d" " -f5);pname=${cfg_ver%-*-*};cfg_ver=${cfg_ver/${pname}-};echo "${os_ver}:${cfg_ver}"\'');   $osver = exec($sshcmd.' '.$c['ip'].' \'os_ver=$(</etc/mageversion);cfg_ver=$(/sbin/magequery -n alxconfig-ng-alx|cut -d" " -f5);pname=${cfg_ver%-*-*};cfg_ver=${cfg_ver/${pname}-};echo "${os_ver}:${cfg_ver}"\'');
147   $osver = explode(':',$osver);   $osver = explode(':',$osver);
148   }   }
149   if($osver[0] == '') $osver[0]='unkown';   if($osver[0] == '') $osver[0]='unkown';

Legend:
Removed from v.1607  
changed lines
  Added in v.1608