Update of /cvsroot/leaf/src/bering-uclibc/apps/mini_httpd In directory sc8-pr-cvs1:/tmp/cvs-serv11932/mini_httpd
Modified Files:
buildtool.cfg buildtool.mk
Added Files:
dirlisting.patch.gz mini_httpd mini_httpd.conf mini_httpds
mini_httpds.conf savelog-mini_httpd
Log Message:
Fixed dir-listing issue with mini-httpd
minor update for weblet-skel (missing image blank.gif, assumptions about what the path
of user sh-httpd looks like)
--- NEW FILE: dirlisting.patch.gz ---
(This appears to be a binary file; contents omitted.)
--- NEW FILE: mini_httpd ---
#! /bin/sh
RCDLINKS="2,S85 3,S85 4,S85 5,S85 0,K15 1,K15 6,K16"
test -x /usr/sbin/mini_httpd || exit 0
WWWDIR=/var/sh-www
case "$1" in
start)
echo -n "Starting mini httpd:"
cd $WWWDIR;start-stop-daemon --start --quiet --pidfile /var/run/mini_httpd.pid
--exec /usr/sbin/mini_httpd -- -C /etc/mini_httpd.conf 2>/dev/null
echo "."
;;
stop)
echo -n "Stopping mini httpd:"
start-stop-daemon --stop --quiet --oknodo --pidfile /var/run/mini_httpd.pid
echo "."
;;
restart)
echo -n "Restarting mini httpd"
start-stop-daemon --stop --quiet --oknodo --pidfile /var/run/mini_httpd.pid
cd $WWWDIR;start-stop-daemon --start --quiet --pidfile /var/run/mini_httpd.pid
--exec /usr/sbin/mini_httpd -- -C /etc/mini_httpd.conf 2>/dev/null
echo "."
;;
*)
echo "Usage: /etc/init.d/mini_httpd {start|stop|restart}"
exit 1
esac
exit 0
--- NEW FILE: mini_httpd.conf ---
port=80
cgipat=cgi-bin/**|plugins/**
user=sh-httpd
logfile=/var/log/mini_httpd.log
pidfile=/var/run/mini_httpd.pid
max_age=0
--- NEW FILE: mini_httpds ---
#! /bin/sh
RCDLINKS="2,S85 3,S85 4,S85 5,S85 0,K15 1,K15 6,K16"
test -x /usr/sbin/mini_httpd || exit 0
WWWDIR=/var/sh-www
case "$1" in
start)
echo -n "Starting mini httpd:"
cd $WWWDIR;start-stop-daemon --start --quiet --pidfile /var/run/mini_httpd.pid
--exec /usr/sbin/mini_httpd -- -C /etc/mini_httpds.conf 2>/dev/null
echo "."
;;
stop)
echo -n "Stopping mini httpd:"
start-stop-daemon --stop --quiet --oknodo --pidfile /var/run/mini_httpd.pid
echo "."
;;
restart)
echo -n "Restarting mini httpd"
start-stop-daemon --stop --quiet --oknodo --pidfile /var/run/mini_httpd.pid
cd $WWWDIR;start-stop-daemon --start --quiet --pidfile /var/run/mini_httpd.pid
--exec /usr/sbin/mini_httpd -- -C /etc/mini_httpds.conf 2>/dev/null
echo "."
;;
*)
echo "Usage: /etc/init.d/mini_httpd {start|stop|restart}"
exit 1
esac
exit 0
--- NEW FILE: mini_httpds.conf ---
nochroot
port=443
cgipat=cgi-bin/**|plugins/**
user=sh-httpd
logfile=/var/log/mini_httpd.log
pidfile=/var/run/mini_httpd.pid
max_age=0
ssl
certfile=mini_httpd.pem
--- NEW FILE: savelog-mini_httpd ---
#!/bin/sh
savelog -u sh-httpd -g wheel -m 640 -p -c 4 /var/log/mini_httpd.log >/dev/null
Index: buildtool.cfg
===================================================================
RCS file: /cvsroot/leaf/src/bering-uclibc/apps/mini_httpd/buildtool.cfg,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** buildtool.cfg 5 Sep 2003 17:51:25 -0000 1.1
--- buildtool.cfg 15 Sep 2003 12:34:23 -0000 1.2
***************
*** 18,29 ****
--- 18,81 ----
</File>
+ <File weblet.skel.tgz>
+ Server = cvs-sourceforge
+ Revision = HEAD
+ Directory = weblet
+ envname = WEBLET_SKEL
+ </File>
+
+
+ <File savelog-mini_httpd>
+ Server = cvs-sourceforge
+ Revision = HEAD
+ Directory = mini_httpd
+ </File>
+
+ <File mini_httpd>
+ Server = cvs-sourceforge
+ Revision = HEAD
+ Directory = mini_httpd
+ </File>
+
+ <File mini_httpds>
+ Server = cvs-sourceforge
+ Revision = HEAD
+ Directory = mini_httpd
+ </File>
+
+ <File mini_httpds.conf>
+ Server = cvs-sourceforge
+ Revision = HEAD
+ Directory = mini_httpd
+ </File>
+
+ <File mini_httpd.conf>
+ Server = cvs-sourceforge
+ Revision = HEAD
+ Directory = mini_httpd
+ </File>
+
+ <File dirlisting.patch.gz>
+ Server = cvs-sourceforge
+ Revision = HEAD
+ Directory = mini_httpd
+ Envname = MINI_HTTPD_PATCH1
+ </File>
+
+
<Package>
<mhttpd>
Version = 1.17beta1
Revision = 1
+
+ Skeleton = content.tgz
Help <<EOF
mini_httpd is a small HTTP server. Its performance is
not great, but for low or medium
traffic sites it's quite adequate. It implements all
the basic features of an HTTP server
+ This package is a drop-in replacement for weblet.lrp.
Simply remove weblet from and add
+ mhttpd to lrpkg.cfg and remove the line in
/etc/inetd.conf that says:
+ www stream tcp nowait sh-httpd
/usr/sbin/tcpd /usr/sbin/sh-httpd
+
See http://www.acme.com/software/mini_httpd/
LRP package by __PACKAGER__, __BUILDDATE__
***************
*** 57,65 ****
</File>
<File>
! Filename = www
Type = directory
! Description = mini_httpd document root
Permissions = 755
</File>
</Contents>
</mhttpd>
--- 109,297 ----
</File>
<File>
! Filename = etc/mini_httpd.conf
! Source = etc/mini_httpd.conf
! Type = binary
! Type = conf
! Description = mini_httpd config file
! Permissions = 755
! </File>
!
! <File>
! Filename = var/log/mini_httpd.log
! Type = exclude
! </File>
!
!
! <File>
! Filename = var/sh-www/plugins
Type = directory
! Owner = 50:4
! </File>
!
! <File>
! Filename = var/sh-www/cgi-bin
! Type = directory
! Owner = 50:4
! </File>
!
! <File>
! Filename = var/sh-www/images
! Type = directory
! Owner = 50:4
! </File>
!
! <File>
! Filename = var/sh-www
! Type = directory
! Type = list
! Owner = 50:4
! </File>
!
! <File>
! Filename = var/sh-www/data
! Type = directory
! Owner = 50:4
! </File>
!
! <File>
! Filename = var/sh-www/data/*
! Type = exclude
! </File>
! <File>
! Filename = var/sh-www/plugins/*
! Type = exclude
! </File>
!
! <File>
! Filename =
etc/cron.daily/savelog-mini_httpd
! Permissions = 755
! </File>
!
! <File>
! Filename = usr/sbin/sh-httpd
! Permissions = 755
! </File>
!
! <File>
! Filename = var/sh-www
! Permissions = 755
! </File>
!
! <File>
! Filename =
var/sh-www/cgi-bin/showplugins
! Permissions = 755
! Owner = 50:4
! </File>
!
! <File>
! Filename =
var/sh-www/cgi-bin/weblet.functions
! Permissions = 755
! Owner = 50:4
! </File>
!
! <File>
! Filename = var/sh-www/cgi-bin/viewmasq
! Permissions = 755
! Owner = 50:4
! </File>
!
! <File>
! Filename = var/sh-www/cgi-bin/viewlogs
! Permissions = 755
! Owner = 50:4
! </File>
!
! <File>
! Filename = var/sh-www/cgi-bin/viewsys
! Permissions = 755
! Owner = 50:4
! </File>
!
! <File>
! Filename = var/sh-www/cgi-bin/viewfw
! Permissions = 755
! Owner = 50:4
! </File>
!
! <File>
! Filename = var/sh-www/cgi-bin/viewnet
Permissions = 755
+ Owner = 50:4
+ </File>
+
+ <File>
+ Filename = var/sh-www/cgi-bin/checkdisk
+ Permissions = 755
+ Owner = 50:4
</File>
+
+ <File>
+ Filename = var/sh-www/cgi-bin/checkfw
+ Permissions = 755
+ Owner = 50:4
+ </File>
+
+ <File>
+ Filename = var/sh-www/cgi-bin/checkmem
+ Permissions = 755
+ Owner = 50:4
+ </File>
+
+ <File>
+ Filename = var/sh-www/cgi-bin/hitsexport
+ Permissions = 755
+ Owner = 50:4
+ </File>
+
+ <File>
+ Filename = var/sh-www/cgi-bin/viewhits
+ Permissions = 755
+ Owner = 50:4
+ </File>
+
+ <File>
+ Filename =
var/sh-www/cgi-bin/viewshorewall
+ Permissions = 755
+ Owner = 50:4
+ </File>
+
+ <File>
+ Filename = var/sh-www/index.html
+ Owner = 50:4
+ </File>
+
+ <File>
+ Filename = var/sh-www/weblet.css
+ Owner = 50:4
+ </File>
+
+ <File>
+ Filename = var/sh-www/images/ok.gif
+ Owner = 50:4
+ </File>
+ <File>
+ Filename = var/sh-www/images/warn.gif
+ Owner = 50:4
+ </File>
+
+ <File>
+ Filename = var/sh-www/images/error.gif
+ Owner = 50:4
+ </File>
+
+ <File>
+ Filename = var/sh-www/images/lrpbkg.gif
+ Owner = 50:4
+ </File>
+ <File>
+ Type = link
+ Filename =
var/sh-www/cgi-bin/viewlogs-www
+ Target = var/sh-www/cgi-bin/viewlogs
+ Owner = 50:4
+ Permissions = 755
+
+ </File>
+
+
</Contents>
</mhttpd>
***************
*** 67,70 ****
--- 299,303 ----
Version = 1.17beta1
Revision = 1
+ Skeleton = content.tgz
Help <<EOF
***************
*** 80,85 ****
chmod 600 mini_httpd.pem
! And copy the resulting mini_httpd.pem file to your
/www directory on the router.
!
See http://www.acme.com/software/mini_httpd/
--- 313,317 ----
chmod 600 mini_httpd.pem
! And copy the resulting mini_httpd.pem file to your
/var/sh-www directory on the router.
See http://www.acme.com/software/mini_httpd/
***************
*** 114,122 ****
</File>
<File>
! Filename = www
Type = directory
! Description = mini_httpd document root
Permissions = 755
</File>
</Contents>
</mhttpds>
--- 346,535 ----
</File>
<File>
! Filename = etc/mini_httpds.conf
! Source = etc/mini_httpds.conf
! Type = binary
! Type = conf
! Description = mini_httpd config file
! Permissions = 755
! </File>
!
! <File>
! Filename = var/log/mini_httpd.log
! Type = exclude
! </File>
!
!
!
! <File>
! Filename = var/sh-www/plugins
Type = directory
! Owner = 50:4
! </File>
!
! <File>
! Filename = var/sh-www/cgi-bin
! Type = directory
! Owner = 50:4
! </File>
!
! <File>
! Filename = var/sh-www/images
! Type = directory
! Owner = 50:4
! </File>
!
! <File>
! Filename = var/sh-www
! Type = directory
! Type = list
! Owner = 50:4
! </File>
!
! <File>
! Filename = var/sh-www/data
! Type = directory
! Owner = 50:4
! </File>
!
! <File>
! Filename = var/sh-www/data/*
! Type = exclude
! </File>
! <File>
! Filename = var/sh-www/plugins/*
! Type = exclude
! </File>
!
! <File>
! Filename =
etc/cron.daily/savelog-mini_httpd
! Permissions = 755
! </File>
!
! <File>
! Filename = usr/sbin/sh-httpd
! Permissions = 755
! </File>
!
! <File>
! Filename = var/sh-www
! Permissions = 755
! </File>
!
! <File>
! Filename =
var/sh-www/cgi-bin/showplugins
! Permissions = 755
! Owner = 50:4
! </File>
!
! <File>
! Filename =
var/sh-www/cgi-bin/weblet.functions
Permissions = 755
+ Owner = 50:4
+ </File>
+
+ <File>
+ Filename = var/sh-www/cgi-bin/viewmasq
+ Permissions = 755
+ Owner = 50:4
+ </File>
+
+ <File>
+ Filename = var/sh-www/cgi-bin/viewlogs
+ Permissions = 755
+ Owner = 50:4
+ </File>
+
+ <File>
+ Filename = var/sh-www/cgi-bin/viewsys
+ Permissions = 755
+ Owner = 50:4
+ </File>
+
+ <File>
+ Filename = var/sh-www/cgi-bin/viewfw
+ Permissions = 755
+ Owner = 50:4
+ </File>
+
+ <File>
+ Filename = var/sh-www/cgi-bin/viewnet
+ Permissions = 755
+ Owner = 50:4
+ </File>
+
+ <File>
+ Filename = var/sh-www/cgi-bin/checkdisk
+ Permissions = 755
+ Owner = 50:4
+ </File>
+
+ <File>
+ Filename = var/sh-www/cgi-bin/checkfw
+ Permissions = 755
+ Owner = 50:4
+ </File>
+
+ <File>
+ Filename = var/sh-www/cgi-bin/checkmem
+ Permissions = 755
+ Owner = 50:4
+ </File>
+
+ <File>
+ Filename = var/sh-www/cgi-bin/hitsexport
+ Permissions = 755
+ Owner = 50:4
+ </File>
+
+ <File>
+ Filename = var/sh-www/cgi-bin/viewhits
+ Permissions = 755
+ Owner = 50:4
+ </File>
+
+ <File>
+ Filename =
var/sh-www/cgi-bin/viewshorewall
+ Permissions = 755
+ Owner = 50:4
</File>
+
+ <File>
+ Filename = var/sh-www/index.html
+ Owner = 50:4
+ </File>
+
+ <File>
+ Filename = var/sh-www/weblet.css
+ Owner = 50:4
+ </File>
+
+ <File>
+ Filename = var/sh-www/images/ok.gif
+ Owner = 50:4
+ </File>
+ <File>
+ Filename = var/sh-www/images/warn.gif
+ Owner = 50:4
+ </File>
+
+ <File>
+ Filename = var/sh-www/images/error.gif
+ Owner = 50:4
+ </File>
+
+ <File>
+ Filename = var/sh-www/images/lrpbkg.gif
+ Owner = 50:4
+ </File>
+ <File>
+ Type = link
+ Filename =
var/sh-www/cgi-bin/viewlogs-www
+ Target = var/sh-www/cgi-bin/viewlogs
+ Owner = 50:4
+ Permissions = 755
+
+ </File>
+
+
</Contents>
</mhttpds>
Index: buildtool.mk
===================================================================
RCS file: /cvsroot/leaf/src/bering-uclibc/apps/mini_httpd/buildtool.mk,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** buildtool.mk 5 Sep 2003 17:51:25 -0000 1.1
--- buildtool.mk 15 Sep 2003 12:34:23 -0000 1.2
***************
*** 13,17 ****
--- 13,33 ----
source:
zcat $(MINI_HTTPD_SOURCE) | tar -xvf -
+ zcat $(MINI_HTTPD_PATCH1) | patch -d $(MINI_HTTPD_DIR) -p1
echo "lrp application/octet-stream" >> $(MINI_HTTPD_DIR)/mime_types.txt
+ # make content.tgz from weblet.skel.tgz
+ mkdir skel
+ (cd skel ; zcat ../$(WEBLET_SKEL) | tar -xvf - );
+ rm -f skel/etc/cron.daily/savelog-sh-httpd
+ -cp savelog-mini_httpd skel/etc/cron.daily/
+ rm -f skel/etc/sh-httpd.conf
+ rm -f skel/etc/sh-httpd.mime
+ rm -rf skel/usr
+ rm -rf skel/var/lib
+ rm -rf skel/var/sh-log
+ (cd skel; tar cvfz ../content.tgz *)
+ rm -rf skel
+ #perl -i -p -e 's,#define\s*SERVER_SOFTWARE.*,#define SERVER_SOFTWARE
"mini_httpd/1.17",' $(MINI_HTTPD_DIR)/version.h
+ perl -i -p -e 's,<BODY\s*BGCOLOR.*$$,<BODY>\\n\\,'
$(MINI_HTTPD_DIR)/mini_httpd.c
+
build:
***************
*** 45,48 ****
--- 61,66 ----
cp mini_httpd $(MINI_HTTPD_TARGET_DIR)/etc/init.d/
cp mini_httpds $(MINI_HTTPD_TARGET_DIR)/etc/init.d/
+ -cp mini_httpds.conf $(BT_STAGING_DIR)/etc/
+ -cp mini_httpd.conf $(BT_STAGING_DIR)/etc/
-$(BT_STRIP) $(STRIP_OPTIONS) $(MINI_HTTPD_TARGET_DIR)/usr/bin/mini_httpd.ssl
-$(BT_STRIP) $(STRIP_OPTIONS) $(MINI_HTTPD_TARGET_DIR)/usr/bin/mini_httpd
-------------------------------------------------------
This sf.net email is sponsored by:ThinkGeek
Welcome to geek heaven.
http://thinkgeek.com/sf
_______________________________________________
Leaf-cvs-commits mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/leaf-cvs-commits
