--- lib/PXElator/httpd.pm 2009/08/03 19:59:08 128 +++ lib/PXElator/httpd.pm 2009/08/05 23:22:17 153 @@ -18,6 +18,16 @@ #use JSON; use IO::Socket::INET; +sub menu {qq{ + +
+home +server +client +
+ +}} + our $pids; $pids = { httpd => $$ } unless defined $pids; # keep pids on refresh @@ -38,6 +48,7 @@ use html; our $static_pids; use progress_bar; +use config; sub static { my ($client,$path) = @_; @@ -98,7 +109,7 @@ sub start_stop { my $daemon = shift; - my $pid = $pids->{$daemon}; + my $pid = $pids->{$daemon} || 'not started'; warn "start_stop $daemon $pid\n"; @@ -149,9 +160,6 @@ $pids->{screen} ? qq|start| : qq|start screen first|; my @rows = ( - 'ip', html::tt( $server::ip ), - 'netmask', html::tt( $server::netmask ), - 'debug', qq|$debug|, ); @@ -204,12 +212,34 @@ } print $client $ok + , menu() , html::table( 2, @rows ) , $below_table , html::tabs( log::mac_changes ) , $debug_proc ; + } 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|
| + , html::table( 2, + 'ip' => $ip, + 'hostname' => qq||, + 'deploy' => html::select( 'deploy', $deploy, config::available ), + ) + , qq|
|
+			, config::for_ip( $ip )
+			, qq|
| + ; } elsif ( $path =~ m{^/our/(\w+)/(\S+)} ) { eval 'our $' . $1 . ' = ' . $2; warn $@ if $@; @@ -242,9 +272,12 @@ } use browser; +use network; sub start { + warn 'tap ', network::tap(); + my $server = IO::Socket::INET->new( Proto => 'tcp', LocalPort => $httpd::port, @@ -280,13 +313,7 @@ warn "500 $request"; } - print $client qq{ -
- reload - index - exit -
- } if $client->connected; + print $client menu() if $client->connected; }