--- lib/PXElator/httpd.pm 2009/08/29 14:45:26 342
+++ lib/PXElator/httpd.pm 2009/08/29 15:30:49 343
@@ -241,10 +241,12 @@
if ( $ip && $ip ne $server::ip ) {
my $hostname = client::conf( $ip, 'hostname' => $param->{hostname} );
+ my $nmap = qq|nmap|;
+
my @table = (
'ip' => qq|old: $ip|,
'hostname' => qq||,
- 'ping' => ping::host($ip) ? qq|up| : qq|down|,
+ 'ping' => ping::host($ip) ? qq|up $nmap| : qq|down $nmap|,
);
my $config;
@@ -288,8 +290,8 @@
print $client ok
, qq|Clients on $server::ip
|
- , html::table( -6,
- 'ip', 'mac', 'dev', 'hostname', 'deploy', 'conf',
+ , html::table( -5,
+ 'ip', 'mac', 'dev', 'hostname', 'conf',
map {
my $ip = $_;
my $conf = client::all_conf( $ip );
@@ -306,8 +308,18 @@
, format::mac( $mac => 'html' )
, $arp->{$mac}
, delete $conf->{hostname}
- , delete $conf->{deploy}
- , ( %$conf ? html::pre_dump( $conf ) : qq|nmap| )
+ , join("\n", map {
+ my $name = $_;
+ my $html = $conf->{$name};
+ if ( $name eq 'amt' ) {
+ $html = qq|logon|;
+ }
+ $html = qq|$html
|
+ unless
+#0 &&
+ $html =~ s{\b(\S+)\t(\S+)\t(\S+)\b}{$3 }gs;
+ qq|$name $html
|
+ } keys %$conf )
);
} client::all_ips
)