slitaz-tools rev 383

netbox: add busybox httpd
author Pascal Bellard <pascal.bellard@slitaz.org>
date Sun Aug 23 20:41:31 2009 +0200 (2009-08-23)
parents e2afd816e6d3
children cab022ab553a
files tinyutils/netbox
line diff
     1.1 --- a/tinyutils/netbox	Tue Aug 18 14:14:35 2009 +0200
     1.2 +++ b/tinyutils/netbox	Sun Aug 23 20:41:31 2009 +0200
     1.3 @@ -343,8 +343,9 @@
     1.4  	$1 | while read exe name call; do
     1.5  	  case "$exe" in
     1.6  	  \#*) continue;;
     1.7 +	  /*)  [ -e $exe ] || continue;;
     1.8 +	  *)   which $exe > /dev/null || continue
     1.9  	  esac
    1.10 -	  which $exe > /dev/null || continue
    1.11  	  if [ "$2" == "header" ]; then
    1.12  	    echo -n "$tmp$name"
    1.13  	    tmp='|'
    1.14 @@ -1235,7 +1236,7 @@
    1.15  $(helpdaemon udhcpd 60x14 UDHCPD_OPTIONS UDHCPD_OPTS)
    1.16  $(configfile /etc/udhcpd.conf UDHCPD_CONF)
    1.17        <hbox>
    1.18 -	$(startstopdaemon udhcpd)
    1.19 +	$(startstopdaemon udhcpd busybox)
    1.20        </hbox>
    1.21       </frame>
    1.22  EOT
    1.23 @@ -1378,7 +1379,7 @@
    1.24  $(helpdaemon dnsd 80x15 DNSD_OPTIONS DNSD_OPTS)
    1.25  $(configfile /etc/dnsd.conf DNSD_CONF)
    1.26        <hbox>
    1.27 -	$(startstopdaemon dnsd)
    1.28 +	$(startstopdaemon dnsd busybox)
    1.29        </hbox>
    1.30       </frame>
    1.31  EOT
    1.32 @@ -1467,8 +1468,8 @@
    1.33  {
    1.34  cat <<EOT
    1.35       <frame Apache>
    1.36 +$(configfile /etc/apache/httpd.conf HTTPD_CONF)
    1.37  $(php_ini)
    1.38 -$(configfile /etc/apache/httpd.conf HTTPD_CONF)
    1.39        <hbox>
    1.40  	$(startstopdaemon apache)
    1.41        </hbox>
    1.42 @@ -1483,8 +1484,9 @@
    1.43  {
    1.44  cat <<EOT
    1.45       <frame Lighttpd>
    1.46 +$(helpdaemon lighttpd 80x15 LIGHTTPD_OPTIONS LIGHTTPD_OPTS)
    1.47 +$(configfile /etc/lighttpd/lighttpd.conf LIGHTTPD_CONF)
    1.48  $(php_ini)
    1.49 -$(configfile /etc/lighttpd/lighttpd.conf LIGHTTPD_CONF)
    1.50        <hbox>
    1.51  	$(startstopdaemon lighttpd)
    1.52        </hbox>
    1.53 @@ -1492,13 +1494,30 @@
    1.54  EOT
    1.55  }
    1.56  
    1.57 +#
    1.58 +# Busybox httpd server
    1.59 +#
    1.60 +tab_httpd()
    1.61 +{
    1.62 +cat <<EOT
    1.63 +     <frame httpd (busybox)>
    1.64 +$(helpdaemon httpd 80x30 HTTPD_OPTIONS HTTPD_OPTS)
    1.65 +$(configfile /etc/httpd.conf HTTPD_CONF)
    1.66 +$(php_ini)
    1.67 +      <hbox>
    1.68 +	$(startstopdaemon httpd busybox)
    1.69 +      </hbox>
    1.70 +     </frame>
    1.71 +EOT
    1.72 +}
    1.73 +
    1.74  data_http()
    1.75  {
    1.76  cat <<EOT
    1.77  httpd       Apache        tab_apache
    1.78  lighttpd    Lighttpd      tab_lighttpd
    1.79 +/etc/httpd.conf   Busybox\ httpd  tab_httpd
    1.80  EOT
    1.81 -#TODO busybox httpd
    1.82  }
    1.83  
    1.84  #