columns ip, mac, hostname

[pxelator] / lib / PXElator / httpd.pm

diff --git a/lib/PXElator/httpd.pm b/lib/PXElator/httpd.pm
index 6ae0211..6eb25ff 100644 (file)
--- a/lib/PXElator/httpd.pm
+++ b/lib/PXElator/httpd.pm
@@ -262,7 +262,7 @@ warn "XXX pids = ", dump( $daemons::pids );
                        print $client ok
                                , qq|<h2>Clients on $server::ip</h2>|
                                , html::table( -5,
-                                       'ip', 'hostname', 'mac', 'deploy', 'arp',
+                                       'ip', 'mac', 'hostname', 'deploy', 'arp',
                                        map {
                                                my $ip = $_;
                                                $ip =~ s{^.+/ip/}{};
@@ -272,8 +272,8 @@ warn "XXX pids = ", dump( $daemons::pids );
                                                $arp =~ s{$ip}{};
                                                (
                                                        qq|<a href=/client/$ip>$ip</a>|
-                                                       , client::conf( $ip, 'hostname' )
                                                        , format::mac( $mac => 'html' )
+                                                       , client::conf( $ip, 'hostname' )
                                                        , html::tt( client::conf( $ip, 'deploy' ) )
                                                        , $arp
                                                );
@@ -281,10 +281,10 @@ warn "XXX pids = ", dump( $daemons::pids );
                                        glob("$server::conf/ip/*") 
                                )
                                , qq|<h2>ARP</h2>|
-                               , html::table( -3, 'mac', 'dev', 'ip',
+                               , html::table( -3, 'ip', 'mac', 'dev',
                                        map {
                                                my $c = $arp->{$_};
-                                               ( format::mac( $_ => 'html' ), $c->[1], $c->[0] )
+                                               ( $c->[0], format::mac( $_ => 'html' ), $c->[1] )
                                        } sort keys %$arp
                                )
                                ;