--- lib/PXElator/httpd.pm 2009/08/29 16:51:07 346
+++ lib/PXElator/httpd.pm 2009/08/29 17:03:35 347
@@ -240,33 +240,25 @@
if ( $ip && $ip ne $server::ip ) {
- my @editable = ( qw/hostname deploy homepage/ );
+ my @editable = ( qw/hostname config homepage/ );
client::conf( $ip, $_ => $param->{$_} ) foreach @editable;
my $conf = client::all_conf( $ip );
- my $deploy = delete $conf->{deploy};
+ my $config = delete $conf->{config};
my $nmap = qq|nmap|;
my @table = (
+ 'ping' => ping::host($ip) ? qq|up $nmap| : qq|down wol $nmap|,
'ip' => qq|old: $ip|,
'mac' => format::mac( delete $conf->{mac}, 'html' ),
'hostname' => qq||,
- 'ping' => ping::host($ip) ? qq|up $nmap| : qq|down wol $nmap|,
- 'deploy' => html::select( 'deploy', $deploy, config::available ),
+ 'config' => html::select( 'config', $config, config::available ),
html::conf( $ip, $conf, 'edit', @editable )
);
warn "XX conf ",dump( $conf );
- my $config = '';
-
- if ( $deploy ) {
- if ( $config = config::for_ip( $ip ) ) {
- $config = qq|config
| . html::pre( $config );
- }
- }
-
print $client ok
, qq||
- , $config
;
+ if ( $config ) {
+ if ( my $for_ip = config::for_ip( $ip ) ) {
+ print $client qq|config::for_ip
| . html::pre( $for_ip );
+ }
+ }
+
if ( my $amt = client::conf( $ip, 'amt' ) ) {
print $client qq|AMT
|, amt::info( $amt, $ip );
}