Update of /cvsroot/leaf/src/bering-uclibc/apps/mini_httpd
In directory sc8-pr-cvs6.sourceforge.net:/tmp/cvs-serv1017
Modified Files:
buildtool.cfg mini_httpd mini_httpd.conf mini_httpds
mini_httpds.conf savelog-mini_httpd savelog-mini_httpds
Log Message:
better integration of config, daemon and cron files
Index: mini_httpds.conf
===================================================================
RCS file: /cvsroot/leaf/src/bering-uclibc/apps/mini_httpd/mini_httpds.conf,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** mini_httpds.conf 30 Jun 2006 20:17:41 -0000 1.4
--- mini_httpds.conf 27 Nov 2006 19:04:47 -0000 1.5
***************
*** 5,8 ****
--- 5,9 ----
logfile=/var/log/mini_httpds.log
pidfile=/var/run/mini_httpds.pid
+ dir=/var/webconf/www
max_age=0
ssl
Index: mini_httpds
===================================================================
RCS file: /cvsroot/leaf/src/bering-uclibc/apps/mini_httpd/mini_httpds,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** mini_httpds 23 Nov 2006 20:11:12 -0000 1.4
--- mini_httpds 27 Nov 2006 19:04:47 -0000 1.5
***************
*** 2,32 ****
RCDLINKS="2,S85 3,S85 4,S85 5,S85 0,K15 1,K15 6,K16"
! test -x /usr/sbin/mini_httpds || exit 0
! WWWDIR=/var/webconf/www
case "$1" in
start)
echo -n "Starting mini httpd:"
! cd $WWWDIR;start-stop-daemon --start --quiet --pidfile
/var/run/mini_httpds.pid --exec /usr/sbin/mini_httpds -- -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_httpds.pid
echo "."
;;
reload)
echo -n "Reloading mini httpd:"
! start-stop-daemon --stop --signal 1 --quiet --pidfile
/var/run/mini_httpds.pid
echo "."
;;
restart)
echo -n "Restarting mini httpd:"
! start-stop-daemon --stop --quiet --oknodo --pidfile
/var/run/mini_httpds.pid
! cd $WWWDIR;start-stop-daemon --start --quiet --pidfile
/var/run/mini_httpds.pid --exec /usr/sbin/mini_httpds -- -C
/etc/mini_httpds.conf 2>/dev/null
echo "."
;;
*)
! echo "Usage: /etc/init.d/mini_httpds {start|stop|reload|restart}"
exit 1
esac
--- 2,37 ----
RCDLINKS="2,S85 3,S85 4,S85 5,S85 0,K15 1,K15 6,K16"
! DAEMON=/usr/sbin/mini_httpds
! pidfile=/var/run/mini_httpds.pid
! config=/etc/mini-httpds.conf
!
! test -x $DAEMON || exit 0
!
! [ -f $config ] && . $config
case "$1" in
start)
echo -n "Starting mini httpd:"
! start-stop-daemon --start --quiet --pidfile $pidfile --exec $DAEMON --
-C $config 2>/dev/null
echo "."
;;
stop)
echo -n "Stopping mini httpd:"
! start-stop-daemon --stop --quiet --oknodo --pidfile $pidfile
echo "."
;;
reload)
echo -n "Reloading mini httpd:"
! start-stop-daemon --stop --signal 1 --quiet --pidfile $pidfile
echo "."
;;
restart)
echo -n "Restarting mini httpd:"
! start-stop-daemon --stop --quiet --oknodo --pidfile $pidfile
! start-stop-daemon --start --quiet --pidfile $pidfile --exec $DAEMON --
-C $config 2>/dev/null
echo "."
;;
*)
! echo "Usage: /etc/init.d/mini_httpd {start|stop|reload|restart}"
exit 1
esac
Index: mini_httpd.conf
===================================================================
RCS file: /cvsroot/leaf/src/bering-uclibc/apps/mini_httpd/mini_httpd.conf,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** mini_httpd.conf 2 Apr 2005 16:06:19 -0000 1.2
--- mini_httpd.conf 27 Nov 2006 19:04:47 -0000 1.3
***************
*** 4,6 ****
--- 4,8 ----
logfile=/var/log/mini_httpd.log
pidfile=/var/run/mini_httpd.pid
+ dir=/var/webconf/www
max_age=0
+
Index: savelog-mini_httpds
===================================================================
RCS file: /cvsroot/leaf/src/bering-uclibc/apps/mini_httpd/savelog-mini_httpds,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** savelog-mini_httpds 23 Nov 2006 20:11:12 -0000 1.3
--- savelog-mini_httpds 27 Nov 2006 19:04:47 -0000 1.4
***************
*** 2,10 ****
# Save daily LOGDEPTH versions of syslogfile
LOGDEPTH=4
# syslogfile name
! LOGFILE=/var/log/mini_httpds.log
! if [ -f $LOGFILE ]; then
! savelog -u sh-httpd -g wheel -m 640 -p -c $LOGDEPTH $LOGFILE >/dev/null
/etc/init.d/mini_httpds reload >/dev/null
fi
--- 2,16 ----
# Save daily LOGDEPTH versions of syslogfile
LOGDEPTH=4
+ # Config file
+ config=/etc/mini-httpds.conf
# syslogfile name
! logfile=/var/log/mini_httpds.log
! # User
! user=sh-httpd
! [ -f $config ] && . $config
!
! if [ -f $logfile ]; then
! savelog -u $user -g wheel -m 640 -p -c $LOGDEPTH $logfile >/dev/null
/etc/init.d/mini_httpds reload >/dev/null
fi
Index: savelog-mini_httpd
===================================================================
RCS file: /cvsroot/leaf/src/bering-uclibc/apps/mini_httpd/savelog-mini_httpd,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** savelog-mini_httpd 23 Nov 2006 20:11:12 -0000 1.2
--- savelog-mini_httpd 27 Nov 2006 19:04:47 -0000 1.3
***************
*** 2,10 ****
# Save daily LOGDEPTH versions of syslogfile
LOGDEPTH=4
# syslogfile name
! LOGFILE=/var/log/mini_httpd.log
! if [ -f $LOGFILE ]; then
! savelog -u sh-httpd -g wheel -m 640 -p -c $LOGDEPTH $LOGFILE >/dev/null
/etc/init.d/mini_httpd reload >/dev/null
fi
--- 2,16 ----
# Save daily LOGDEPTH versions of syslogfile
LOGDEPTH=4
+ # Config file
+ config=/etc/mini-httpd.conf
# syslogfile name
! logfile=/var/log/mini_httpd.log
! # User
! user=sh-httpd
! [ -f $config ] && . $config
!
! if [ -f $logfile ]; then
! savelog -u $user -g wheel -m 640 -p -c $LOGDEPTH $logfile >/dev/null
/etc/init.d/mini_httpd reload >/dev/null
fi
Index: buildtool.cfg
===================================================================
RCS file: /cvsroot/leaf/src/bering-uclibc/apps/mini_httpd/buildtool.cfg,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -d -r1.12 -r1.13
*** buildtool.cfg 23 Nov 2006 20:11:12 -0000 1.12
--- buildtool.cfg 27 Nov 2006 19:04:47 -0000 1.13
***************
*** 48,63 ****
</File>
- #<File dirlisting.patch.gz>
- # Server = cvs-sourceforge
- # Revision = HEAD
- # Directory = mini_httpd
- # Envname = MINI_HTTPD_PATCH1
- #</File>
-
-
<Package>
<mhttpd>
Version = 1.19
! Revision = 3
--- 48,55 ----
</File>
<Package>
<mhttpd>
Version = 1.19
! Revision = 4
***************
*** 87,98 ****
Permissions = 755
</File>
-
<File>
Filename = etc/init.d/mini_httpd
Source = etc/init.d/mini_httpd
Type = binary
! Type = local
! Type = conf
! Description = mini_httpd init file
Permissions = 755
</File>
--- 79,87 ----
Permissions = 755
</File>
<File>
Filename = etc/init.d/mini_httpd
Source = etc/init.d/mini_httpd
Type = binary
! Description = mini_httpd init file
Permissions = 755
</File>
***************
*** 103,116 ****
Type = local
Type = conf
! Description = mini_httpd config file
</File>
-
<File>
Filename =
etc/cron.daily/savelog-mini_httpd
Source =
etc/cron.daily/savelog-mini_httpd
Type = binary
Permissions = 755
</File>
-
<File>
Filename = var/webconf/www
--- 92,104 ----
Type = local
Type = conf
! Description = mini_httpd config file
</File>
<File>
Filename =
etc/cron.daily/savelog-mini_httpd
Source =
etc/cron.daily/savelog-mini_httpd
Type = binary
+ Type = local
Permissions = 755
</File>
<File>
Filename = var/webconf/www
***************
*** 121,125 ****
<mhttpds>
Version = 1.19
! Revision = 4
Help <<EOF
--- 109,113 ----
<mhttpds>
Version = 1.19
! Revision = 5
Help <<EOF
Index: mini_httpd
===================================================================
RCS file: /cvsroot/leaf/src/bering-uclibc/apps/mini_httpd/mini_httpd,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** mini_httpd 23 Nov 2006 20:11:12 -0000 1.3
--- mini_httpd 27 Nov 2006 19:04:47 -0000 1.4
***************
*** 2,28 ****
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/webconf/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 "."
;;
reload)
echo -n "Reloading mini httpd:"
! start-stop-daemon --stop --signal 1 --quiet --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 "."
;;
--- 2,33 ----
RCDLINKS="2,S85 3,S85 4,S85 5,S85 0,K15 1,K15 6,K16"
! DAEMON=/usr/sbin/mini_httpd
! pidfile=/var/run/mini_httpd.pid
! config=/etc/mini-httpd.conf
!
! test -x $DAEMON || exit 0
!
! [ -f $config ] && . $config
case "$1" in
start)
echo -n "Starting mini httpd:"
! start-stop-daemon --start --quiet --pidfile $pidfile --exec $DAEMON --
-C $config 2>/dev/null
echo "."
;;
stop)
echo -n "Stopping mini httpd:"
! start-stop-daemon --stop --quiet --oknodo --pidfile $pidfile
echo "."
;;
reload)
echo -n "Reloading mini httpd:"
! start-stop-daemon --stop --signal 1 --quiet --pidfile $pidfile
echo "."
;;
restart)
echo -n "Restarting mini httpd:"
! start-stop-daemon --stop --quiet --oknodo --pidfile $pidfile
! start-stop-daemon --start --quiet --pidfile $pidfile --exec $DAEMON --
-C $config 2>/dev/null
echo "."
;;
-------------------------------------------------------------------------
Take Surveys. Earn Cash. Influence the Future of IT
Join SourceForge.net's Techsay panel and you'll get the chance to share your
opinions on IT & business topics through brief surveys - and earn cash
http://www.techsay.com/default.php?page=join.php&p=sourceforge&CID=DEVDEV
_______________________________________________
leaf-cvs-commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/leaf-cvs-commits
