diff --git a/wol/scripts/get_ips.sh b/wol/scripts/get_ips.sh deleted file mode 100755 index d37fdb3c8092d7da6a0bd223a1a2224d602cc405..0000000000000000000000000000000000000000 --- a/wol/scripts/get_ips.sh +++ /dev/null @@ -1,3 +0,0 @@ -#!/bin/bash -awk '/^lease/{IP=$2} /hardware ethernet/{gsub(";","",$3);if($3 == "'$1'"){print IP}}' \ - < /var/lib/dhcp/dhcpd.leases | sort -u diff --git a/wol/scripts/wakeonlanservice.sh b/wol/scripts/wakeonlanservice.sh index 5823e5cfb3ed4f49afaf8dab1532243e5d13f1b1..62828a4ed74cfc590fa6aba89f3d7527239a2c79 100755 --- a/wol/scripts/wakeonlanservice.sh +++ b/wol/scripts/wakeonlanservice.sh @@ -47,6 +47,14 @@ do done elif [ $MAC == "get_registry" ] then - stdbuf -oL cat /etc/registry/hosts | netcat $host $port + hostfile="/etc/registry/hosts" + while read line + do + mac=$(echo $line | cut -d ' ' -f 2) + IPS=$(getip $mac | sed -e 's/ /,/g') + echo "$line $IPS" >> $hostfile-$$ + done < $hostfile + stdbuf -oL cat $hostfile-$$ | netcat $host $port + rm $hostfile-$$ fi done diff --git a/wol/www/index.php b/wol/www/index.php index ed2e0099f6c62cb5755d0ae38efbf9d2af4d7842..8555270c157697b053651b5964f48f04528373d0 100644 --- a/wol/www/index.php +++ b/wol/www/index.php @@ -41,20 +41,19 @@ $lines=shell_exec("../scripts/get_registry.sh"); $registry = array(); foreach(explode(PHP_EOL, $lines) as $line){ if($line != ""){ - $IPS=shell_exec("../script/get_ips.sh ".escapeshellarg($entry[1])); $entry=explode(' ', $line); array_push($registry, $entry); - # Format date mac name [num_apt_upgrade deb_version pt_version git_branch git_update] + # Format date mac name ip [num_apt_upgrade deb_version pt_version git_branch git_update] echo "<tr>"; echo "<td>".$entry[2]."</td>"; - echo "<td> ".$IPS."</td>"; + echo "<td> ".$entry[3]."</td>"; echo "<td>".$entry[1]."</td>"; #echo "<td>".$entry[0]."</td>"; - if(count($entry) > 3){ - echo "<td>".$entry[4]."</td>"; + if(count($entry) > 4){ echo "<td>".$entry[5]."</td>"; - echo "<td>".$entry[3]." mises à jour en attente</td>"; - echo "<td> branch ".$entry[6]." ".$entry[7]." commits en retard</td>"; + echo "<td>".$entry[6]."</td>"; + echo "<td>".$entry[4]." mises à jour en attente</td>"; + echo "<td> branch ".$entry[7]." ".$entry[8]." commits en retard</td>"; }else{ echo "<td>NA</td>"; echo "<td>NA</td>";