diff --git a/conf/boa.conf b/conf/boa.conf deleted file mode 100644 index 0ac987eaf5..0000000000 --- a/conf/boa.conf +++ /dev/null @@ -1,241 +0,0 @@ -# Boa v0.94 configuration file -# File format has not changed from 0.93 -# File format has changed little from 0.92 -# version changes are noted in the comments -# -# The Boa configuration file is parsed with a custom parser. If it -# reports an error, the line number will be provided; it should be easy -# to spot. The syntax of each of these rules is very simple, and they -# can occur in any order. Where possible these directives mimic those -# of NCSA httpd 1.3; I saw no reason to introduce gratuitous -# differences. - -# $Id$ - -# The "ServerRoot" is not in this configuration file. It can be -# compiled into the server (see defines.h) or specified on the command -# line with the -c option, for example: -# -# boa -c /usr/local/boa - - -# Port: The port Boa runs on. The default port for http servers is 80. -# If it is less than 1024, the server must be started as root. - -Port 8889 - -# Listen: the Internet address to bind(2) to. If you leave it out, -# it takes the behavior before 0.93.17.2, which is to bind to all -# addresses (INADDR_ANY). You only get one "Listen" directive, -# if you want service on multiple IP addresses, you have three choices: -# 1. Run boa without a "Listen" directive -# a. All addresses are treated the same; makes sense if the addresses -# are localhost, ppp, and eth0. -# b. Use the VirtualHost directive below to point requests to different -# files. Should be good for a very large number of addresses (web -# hosting clients). -# 2. Run one copy of boa per IP address, each has its own configuration -# with a "Listen" directive. No big deal up to a few tens of addresses. -# Nice separation between clients. -# The name you provide gets run through inet_aton(3), so you have to use dotted -# quad notation. This configuration is too important to trust some DNS. - -#Listen 192.68.0.5 - -# User: The name or UID the server should run as. -# Group: The group name or GID the server should run as. - -User www-data -Group www-data - -# ServerAdmin: The email address where server problems should be sent. -# Note: this is not currently used, except as an environment variable -# for CGIs. - -#ServerAdmin root@localhost - -# PidFile: where to put the pid of the process. -# Comment out to write no pid file. -# Note: Because Boa drops privileges at startup, and the -# pid file is written by the UID/GID before doing so, Boa -# does not attempt removal of the pid file. -# PidFile /var/run/boa.pid - -# ErrorLog: The location of the error log file. If this does not start -# with /, it is considered relative to the server root. -# Set to /dev/null if you don't want errors logged. -# If unset, defaults to /dev/stderr -# Please NOTE: Sending the logs to a pipe ('|'), as shown below, -# is somewhat experimental and might fail under heavy load. -# "Usual libc implementations of printf will stall the whole -# process if the receiving end of a pipe stops reading." -#ErrorLog "|/usr/sbin/cronolog --symlink=/var/log/boa/error_log /var/log/boa/error-%Y%m%d.log" - -ErrorLog PAPARAZZI_HOME/var/logs/boa.log - -# AccessLog: The location of the access log file. If this does not -# start with /, it is considered relative to the server root. -# Comment out or set to /dev/null (less effective) to disable. -# Useful to set to /dev/stdout for use with daemontools. -# Access logging. -# Please NOTE: Sending the logs to a pipe ('|'), as shown below, -# is somewhat experimental and might fail under heavy load. -# "Usual libc implementations of printf will stall the whole -# process if the receiving end of a pipe stops reading." -#AccessLog "|/usr/sbin/cronolog --symlink=/var/log/boa/access_log /var/log/boa/access-%Y%m%d.log" - -AccessLog PAPARAZZI_HOME/var/logs/boa_access.log - -# CGILog /var/log/boa/cgi_log -# CGILog: The location of the CGI stderr log file. If this does not -# start with /, it is considered relative to the server root. -# The log file would contain any contents send to /dev/stderr -# by the CGI. If this is commented out, it defaults to whatever -# ErrorLog points. Set to /dev/null to disable CGI stderr logging. -# Please NOTE: Sending the logs to a pipe ('|'), as shown below, -# is somewhat experimental and might fail under heavy load. -# "Usual libc implementations of printf will stall the whole -# process if the receiving end of a pipe stops reading." -#CGILog "|/usr/sbin/cronolog --symlink=/var/log/boa/cgi_log /var/log/boa/cgi-%Y%m%d.log" - -# CGIumask 027 (no mask for user, read-only for group, and nothing for user) -# CGIumask 027 -# The CGIumask is set immediately before execution of the CGI. - -# UseLocaltime: Logical switch. Uncomment to use localtime -# instead of UTC time -#UseLocaltime - -# VerboseCGILogs: this is just a logical switch. -# It simply notes the start and stop times of cgis in the error log -# Comment out to disable. - -#VerboseCGILogs - -# ServerName: the name of this server that should be sent back to -# clients if different than that returned by gethostname + gethostbyname - -#ServerName www.your.org.here - -# VirtualHost: a logical switch. -# Comment out to disable. -# Given DocumentRoot /var/www, requests on interface 'A' or IP 'IP-A' -# become /var/www/IP-A. -# Example: http://localhost/ becomes /var/www/127.0.0.1 -# -# Not used until version 0.93.17.2. This "feature" also breaks commonlog -# output rules, it prepends the interface number to each access_log line. -# You are expected to fix that problem with a postprocessing script. - -#VirtualHost - - -# VHostRoot: the root location for all virtually hosted data -# Comment out to disable. -# Incompatible with 'Virtualhost' and 'DocumentRoot'!! -# Given VHostRoot /var/www, requests to host foo.bar.com, -# where foo.bar.com is ip a.b.c.d, -# become /var/www/a.b.c.d/foo.bar.com -# Hostnames are "cleaned", and must conform to the rules -# specified in rfc1034, which are be summarized here: -# -# Hostnames must start with a letter, end with a letter or digit, -# and have as interior characters only letters, digits, and hyphen. -# Hostnames must not exceed 63 characters in length. - -#VHostRoot /var/www - -# DefaultVHost -# Define this in order to have a default hostname when the client does not -# specify one, if using VirtualHostName. If not specified, the word -# "default" will be used for compatibility with older clients. - -#DefaultVHost foo.bar.com - -# DocumentRoot: The root directory of the HTML documents. -# Comment out to disable server non user files. - -DocumentRoot PAPARAZZI_HOME - -# UserDir: The name of the directory which is appended onto a user's home -# directory if a ~user request is received. - -UserDir public_html - -# DirectoryIndex: Name of the file to use as a pre-written HTML -# directory index. Please MAKE AND USE THESE FILES. On the -# fly creation of directory indexes can be _slow_. -# Comment out to always use DirectoryMaker - -DirectoryIndex index.html - -# DirectoryMaker: Name of program used to create a directory listing. -# Comment out to disable directory listings. If both this and -# DirectoryIndex are commented out, accessing a directory will give -# an error (though accessing files in the directory are still ok). - -DirectoryMaker /usr/lib/boa/boa_indexer - -# DirectoryCache: If DirectoryIndex doesn't exist, and DirectoryMaker -# has been commented out, the the on-the-fly indexing of Boa can be used -# to generate indexes of directories. Be warned that the output is -# extremely minimal and can cause delays when slow disks are used. -# Note: The DirectoryCache must be writable by the same user/group that -# Boa runs as. - -# DirectoryCache /var/spool/boa/dircache - -# KeepAliveMax: Number of KeepAlive requests to allow per connection -# Comment out, or set to 0 to disable keepalive processing - -KeepAliveMax 1000 - -# KeepAliveTimeout: seconds to wait before keepalive connection times out - -KeepAliveTimeout 10 - -# MimeTypes: This is the file that is used to generate mime type pairs -# and Content-Type fields for boa. -# Set to /dev/null if you do not want to load a mime types file. -# Do *not* comment out (better use AddType!) - -MimeTypes /etc/mime.types - -# DefaultType: MIME type used if the file extension is unknown, or there -# is no file extension. - -DefaultType text/plain - -# CGIPath: The value of the $PATH environment variable given to CGI progs. - -CGIPath /bin:/usr/bin:/usr/local/bin - -# SinglePostLimit: The maximum allowable number of bytes in -# a single POST. Default is normally 1MB. - -# AddType: adds types without editing mime.types -# Example: AddType type extension [extension ...] - -# Uncomment the next line if you want .cgi files to execute from anywhere -AddType application/x-httpd-cgi cgi - -# Redirect, Alias, and ScriptAlias all have the same semantics -- they -# match the beginning of a request and take appropriate action. Use -# Redirect for other servers, Alias for the same server, and ScriptAlias -# to enable directories for script execution. - -# Redirect allows you to tell clients about documents which used to exist in -# your server's namespace, but do not anymore. This allows you to tell the -# clients where to look for the relocated document. -# Example: Redirect /bar http://elsewhere/feh/bar - -# Aliases: Aliases one path to another. -# Example: Alias /path1/bar /path2/foo - -Alias /doc /usr/share/doc - -# ScriptAlias: Maps a virtual path to a directory for serving scripts -# Example: ScriptAlias /htbin/ /www/htbin/ - -ScriptAlias /cgi-bin/ PAPARAZZI_HOME/sw/cgi/ - diff --git a/conf/control_panel_example.xml b/conf/control_panel_example.xml index 91b86c0d49..9dbd7be05a 100644 --- a/conf/control_panel_example.xml +++ b/conf/control_panel_example.xml @@ -68,8 +68,6 @@ - - diff --git a/sw/cgi/configuration.cgi b/sw/cgi/configuration.cgi deleted file mode 100755 index 089040cd00..0000000000 --- a/sw/cgi/configuration.cgi +++ /dev/null @@ -1,57 +0,0 @@ -#!/usr/bin/perl - -# displays the current configuration - -use strict; -use warnings; - -use Cwd; -use CGI ':standard', '*table'; - -my $paparazzi_src; -my $paparazzi_lib; -BEGIN { - $paparazzi_src = getcwd()."/../.."; - $paparazzi_lib = $paparazzi_src."/sw/lib/perl"; -} -use lib ($paparazzi_lib); -my $paparazzi_home = $paparazzi_src; - -use Paparazzi::Environment; -Paparazzi::Environment::set_env($paparazzi_src, $paparazzi_home); - -use Paparazzi::Configuration; - -print - header(), - start_html("Paparazzi configuration"); - -my $configuration = Paparazzi::Configuration::read_current(); -print - h1 ("Paparazzi Configuration"), - h2 ("Aircrafts"); -print - start_table({border => undef}), - Tr(th(["Id", "Name", "Airframe", "Radio", "Flight plan"])); -foreach my $ac (@{$configuration->{aircrafts}}) { - print - Tr(td([$ac->{ac_id}, $ac->{name}, - a({href=>"../conf/$ac->{airframe}"}, foo($ac->{airframe}) ), - a({href=>"../conf/$ac->{radio}"}, foo($ac->{radio}) ), - a({href=>"../conf/$ac->{flight_plan}"}, foo($ac->{flight_plan}) )])); -} -print end_table(); - -print - h2 ("Ground"), - ul(li (["name : ".$configuration->{ground}->{name}, - "ivy bus : ".$configuration->{ground}->{ivy_bus} - ])), - hr(), - a({href=>"../index.html"}, "home"), - end_html(); - - -sub foo { - return ($_[0] =~ /([^\/]*)$/ ); -} diff --git a/sw/cgi/logs.cgi b/sw/cgi/logs.cgi deleted file mode 100755 index a86ebc7ba0..0000000000 --- a/sw/cgi/logs.cgi +++ /dev/null @@ -1,54 +0,0 @@ -#!/usr/bin/perl - -# displays available logs - -use strict; -use warnings; - -use Cwd; -use CGI ":standard"; -my $paparazzi_src; -my $paparazzi_lib; -BEGIN { - $paparazzi_src = getcwd()."/../.."; - $paparazzi_lib = $paparazzi_src."/sw/lib/perl"; -} -use lib ($paparazzi_lib); -my $paparazzi_home = $paparazzi_src; - -use Paparazzi::Environment; -Paparazzi::Environment::set_env($paparazzi_src, $paparazzi_home); - -use Paparazzi::Log; - -my $query = new CGI(); -print $query->header(); -print $query->start_html("Paparazzi Logs"); - -my @logs = Paparazzi::Log::get_available(); - -my $log_info = undef; -my $log_data = undef; -my @files = $query->param('file'); -if ($#files >=0 ) { - $log_info = Paparazzi::Log::read_infos($files[0]); - $log_data = Paparazzi::Log::read_data($log_info->{data_file}); -} - -print "\n

Paparazzi Logs.

\n"; -print "

Logs.

\n"; -print $query->startform(); -print $query->popup_menu('file', \@logs, $logs[0]); -print $query->submit('Action','Update'); -print $query->endform(); -if (defined $log_info) { - print $query->path_info()."
"; - Paparazzi::Log::html_print_summary($log_info, $log_data); - my $url = Paparazzi::Log::gen_activity_plot($log_info, $log_data); - print"\n"; -} -print "
\n"; -print "home
\n"; -print "
\n"; -print "
Poine.

\n"; - diff --git a/sw/ground_segment/tmtc/Makefile b/sw/ground_segment/tmtc/Makefile index 5d5d38f7b7..6b138de515 100644 --- a/sw/ground_segment/tmtc/Makefile +++ b/sw/ground_segment/tmtc/Makefile @@ -41,7 +41,7 @@ SERVERCMO = server_globals.cmo aircraft.cmo wind.cmo airprox.cmo kml.cmo fw_serv SERVERCMX = $(SERVERCMO:.cmo=.cmx) -all: link server messages settings dia diadec $(VAR)/boa.conf ivy_tcp_aircraft ivy_tcp_controller broadcaster ivy2udp ivy_serial_bridge +all: link server messages settings dia diadec ivy_tcp_aircraft ivy_tcp_controller broadcaster ivy2udp ivy_serial_bridge opt: server.opt @@ -49,11 +49,6 @@ clean: $(Q)rm -f link server messages settings dia diadec *.bak *~ core *.o .depend *.opt *.out *.cm* ivy_tcp_aircraft ivy_tcp_controller broadcaster ivy2udp ivy_serial_bridge gpsd2ivy c_ivy_client_example_1 c_ivy_client_example_2 c_ivy_client_example_3 -$(VAR)/boa.conf :$(CONF)/boa.conf - mkdir -p $(VAR) - sed 's|PAPARAZZI_HOME|$(PAPARAZZI_HOME)|' < $< > $@ - - messages : messages.cmo $(LIBPPRZCMA) @echo OL $@ $(Q)$(OCAMLC) $(INCLUDES) -o $@ $(LINKPKG) gtkInit.cmo $< diff --git a/sw/ground_segment/tmtc/boa b/sw/ground_segment/tmtc/boa deleted file mode 100755 index 75446c3443..0000000000 --- a/sw/ground_segment/tmtc/boa +++ /dev/null @@ -1,6 +0,0 @@ -#! /bin/sh -if test -z "$PAPARAZZI_SRC"; then - PAPARAZZI_SRC=/usr/share/paparazzi -fi -mkdir -p $PAPARAZZI_HOME/var/logs -/usr/sbin/boa -d -f $PAPARAZZI_HOME/var/boa.conf