--- lib/PXElator/httpd.pm 2009/08/05 23:22:17 153 +++ lib/PXElator/httpd.pm 2009/08/06 22:29:58 173 @@ -17,6 +17,7 @@ use File::Slurp; #use JSON; use IO::Socket::INET; +use Regexp::Common qw/net/; sub menu {qq{ @@ -49,6 +50,9 @@ our $static_pids; use progress_bar; use config; +use client; +use log; +use x11; sub static { my ($client,$path) = @_; @@ -102,7 +106,6 @@ use boolean; -use screen; use kvm; $SIG{CHLD} = 'IGNORE'; @@ -130,10 +133,16 @@ # child my $invoke = 'start'; $invoke = $1 if $daemon =~ s{/(.+)}{}; - my $eval = $daemon . '::' . $invoke . '(' . ( @_ ? dump(@_) : '' ) . ')'; - warn "eval $eval"; - eval $eval; - warn "can't start $daemon: $@" if $@; + if ( $daemon =~ m{dhcpd|tftpd|dnsd} ) { + my $exec = "perl -I$server::base_dir/lib -I$server::base_dir/lib/PXElator -M$daemon -e ${daemon}::${invoke}"; + warn "exec $exec"; + x11::xterm( $daemon => $exec ); + } else { + my $eval = $daemon . '::' . $invoke . '(' . ( @_ ? dump(@_) : '' ) . ')'; + warn "eval $eval"; + eval $eval; + warn "can't start $daemon: $@" if $@; + } exit; } else { die "fork error $!"; @@ -141,7 +150,7 @@ } } -my $ok = qq|HTTP/1.0 200 OK\r\nContent-Type: text/html\r\nConnection: close\r\n\r\n|; +my $ok = qq|HTTP/1.0 200 OK\r\nContent-Type: text/html\r\nConnection: close\r\n\r\n| . menu(); my $redirect = qq|HTTP/1.1 302 Found\r\nContent-type: text/html\r\nLocation: $url\r\n\r\n|; sub get_request { @@ -155,10 +164,6 @@ warn "static $found" if $debug; } elsif ( $path eq '/' ) { - my $screen = $pids->{screen} ? qq|stop $pids->{screen}| : 'start'; - my $kvm = $pids->{kvm} ? qq|stop $pids->{kvm}| : - $pids->{screen} ? qq|start| : qq|start screen first|; - my @rows = ( 'debug', qq|$debug|, ); @@ -169,11 +174,12 @@ foreach my $name ( sort keys %$pids ) { my $pid = $pids->{$name} || next; - my $html = qq|$pid|; + my $html; my $proc = "/proc/$pid/status"; if ( -e $proc ) { + $html .= qq|$pid|; if ( $debug ) { $html .= qq| ?|; @@ -191,6 +197,8 @@ if ( $name->can('actions') ) { $html .= qq| $_| foreach $name->actions; } + } else { + $html .= qq|restart $pid exited|; } push @rows, ( $name => $html ); @@ -212,7 +220,6 @@ } print $client $ok - , menu() , html::table( 2, @rows ) , $below_table , html::tabs( log::mac_changes ) @@ -221,31 +228,46 @@ } elsif ( $path =~ m{^/server} ) { print $client $ok - , menu() , html::table( 2, map { ( $_, eval '$server::'.$_ ) } ( 'ip', 'netmask', 'ip_from', 'ip_to', 'domain_name', 'base_dir' ) ) ; - } elsif ( $path =~ m{^/client} ) { - my $ip = $client->peerhost; - my $hostname = server::shared( "hostname/$ip", $param->{hostname} ); - my $deploy = server::shared( "deploy/$ip", $param->{deploy} ); - print $client $ok - , menu() - , qq|
| - , config::for_ip( $ip ) - , qq|| - ; + } elsif ( $path =~ m!^/client(?:/$RE{net}{IPv4}{-keep})?! ) { + my $ip = $1 || $client->peerhost; + if ( $ip ne $server::ip ) { + my $hostname = client::conf( $ip, 'hostname' => $param->{hostname} ); + my $deploy = client::conf( $ip, 'deploy' => $param->{deploy} ); + print $client $ok + , qq|| + , qq|
| + , config::for_ip( $ip ) + , qq|| + ; + } else { + print $client $ok + , qq|