Menu
▾
▴
bobs-cvs — CVS commit messages
You can subscribe to this list here.
| 2002 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
(9) |
Nov
|
Dec
(26) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2003 |
Jan
(3) |
Feb
(38) |
Mar
(11) |
Apr
(38) |
May
(21) |
Jun
(4) |
Jul
(1) |
Aug
|
Sep
|
Oct
|
Nov
|
Dec
(5) |
| 2004 |
Jan
(8) |
Feb
(1) |
Mar
(21) |
Apr
(16) |
May
(9) |
Jun
(20) |
Jul
|
Aug
(19) |
Sep
|
Oct
(1) |
Nov
(2) |
Dec
|
| 2005 |
Jan
(3) |
Feb
|
Mar
|
Apr
|
May
(7) |
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
| 2006 |
Jan
|
Feb
|
Mar
(1) |
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
| 2007 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
(1) |
Jul
(4) |
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
| 2010 |
Jan
|
Feb
(14) |
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
|
From: Joe Z. <jz...@us...> - 2004-03-28 22:44:44
|
Update of /cvsroot/bobs/bobs/winc In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv25059/bobs/winc Modified Files: Makefile.in Log Message: Start cmdloop from /etc/init.d/cmdloopd instead of using check_loop in /etc/crontab. Index: Makefile.in =================================================================== RCS file: /cvsroot/bobs/bobs/winc/Makefile.in,v retrieving revision 1.4 retrieving revision 1.5 diff -u -d -r1.4 -r1.5 --- Makefile.in 24 Apr 2003 06:16:00 -0000 1.4 +++ Makefile.in 28 Mar 2004 22:33:23 -0000 1.5 @@ -75,14 +75,16 @@ install_sh = @install_sh@ myBOBSDATA = @myBOBSDATA@ myCRONDIR = @myCRONDIR@ -myCRONTABDIR = @myCRONTABDIR@ myHTTPDUSER = @myHTTPDUSER@ +myLOGDIR = @myLOGDIR@ myMANDIR = @myMANDIR@ myPASS = @myPASS@ +mySYSCONFDIR = @mySYSCONFDIR@ myWEBDIR = @myWEBDIR@ myrealBOBSDATA = @myrealBOBSDATA@ myrealCRONDIR = @myrealCRONDIR@ -myrealCRONTABDIR = @myrealCRONTABDIR@ +myrealLOGDIR = @myrealLOGDIR@ +myrealSYSCONFDIR = @myrealSYSCONFDIR@ myrealWEBDIR = @myrealWEBDIR@ htmldir = $(myWEBDIR)/winc |
|
From: Joe Z. <jz...@us...> - 2004-03-28 22:44:44
|
Update of /cvsroot/bobs/bobs/inc/servers In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv25059/bobs/inc/servers Modified Files: Makefile.in Log Message: Start cmdloop from /etc/init.d/cmdloopd instead of using check_loop in /etc/crontab. Index: Makefile.in =================================================================== RCS file: /cvsroot/bobs/bobs/inc/servers/Makefile.in,v retrieving revision 1.5 retrieving revision 1.6 diff -u -d -r1.5 -r1.6 --- Makefile.in 24 Apr 2003 06:15:59 -0000 1.5 +++ Makefile.in 28 Mar 2004 22:33:23 -0000 1.6 @@ -75,14 +75,16 @@ install_sh = @install_sh@ myBOBSDATA = @myBOBSDATA@ myCRONDIR = @myCRONDIR@ -myCRONTABDIR = @myCRONTABDIR@ myHTTPDUSER = @myHTTPDUSER@ +myLOGDIR = @myLOGDIR@ myMANDIR = @myMANDIR@ myPASS = @myPASS@ +mySYSCONFDIR = @mySYSCONFDIR@ myWEBDIR = @myWEBDIR@ myrealBOBSDATA = @myrealBOBSDATA@ myrealCRONDIR = @myrealCRONDIR@ -myrealCRONTABDIR = @myrealCRONTABDIR@ +myrealLOGDIR = @myrealLOGDIR@ +myrealSYSCONFDIR = @myrealSYSCONFDIR@ myrealWEBDIR = @myrealWEBDIR@ htmldir = $(myWEBDIR)/inc/servers |
|
From: Joe Z. <jz...@us...> - 2004-03-28 22:44:44
|
Update of /cvsroot/bobs/bobs/inc In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv25059/bobs/inc Modified Files: Makefile.in class_config.php config.php.in Log Message: Start cmdloop from /etc/init.d/cmdloopd instead of using check_loop in /etc/crontab. Index: Makefile.in =================================================================== RCS file: /cvsroot/bobs/bobs/inc/Makefile.in,v retrieving revision 1.4 retrieving revision 1.5 diff -u -d -r1.4 -r1.5 --- Makefile.in 24 Apr 2003 06:15:58 -0000 1.4 +++ Makefile.in 28 Mar 2004 22:33:22 -0000 1.5 @@ -75,14 +75,16 @@ install_sh = @install_sh@ myBOBSDATA = @myBOBSDATA@ myCRONDIR = @myCRONDIR@ -myCRONTABDIR = @myCRONTABDIR@ myHTTPDUSER = @myHTTPDUSER@ +myLOGDIR = @myLOGDIR@ myMANDIR = @myMANDIR@ myPASS = @myPASS@ +mySYSCONFDIR = @mySYSCONFDIR@ myWEBDIR = @myWEBDIR@ myrealBOBSDATA = @myrealBOBSDATA@ myrealCRONDIR = @myrealCRONDIR@ -myrealCRONTABDIR = @myrealCRONTABDIR@ +myrealLOGDIR = @myrealLOGDIR@ +myrealSYSCONFDIR = @myrealSYSCONFDIR@ myrealWEBDIR = @myrealWEBDIR@ SUBDIRS = excludes servers templates Index: class_config.php =================================================================== RCS file: /cvsroot/bobs/bobs/inc/class_config.php,v retrieving revision 1.14 retrieving revision 1.15 diff -u -d -r1.14 -r1.15 --- class_config.php 8 May 2003 05:46:51 -0000 1.14 +++ class_config.php 28 Mar 2004 22:33:22 -0000 1.15 @@ -81,14 +81,5 @@ return $this->sys_conf['crondir']; } -// --------------------------------------------------------- -// get_crontabdir - Return the crontab directory name -// Used by: servercheck.php -// Returns: crontab directory name -// --------------------------------------------------------- -function get_crontabdir(){ - return $this->sys_conf['crontabdir']; -} - } // Class end bracket ?> Index: config.php.in =================================================================== RCS file: /cvsroot/bobs/bobs/inc/config.php.in,v retrieving revision 1.10 retrieving revision 1.11 diff -u -d -r1.10 -r1.11 --- config.php.in 20 Jan 2004 04:14:01 -0000 1.10 +++ config.php.in 28 Mar 2004 22:33:22 -0000 1.11 @@ -23,7 +23,6 @@ // Cron daily and crontab locations $sys_conf["crondir"] = '@myrealCRONDIR@'; -$sys_conf["crontabdir"] = '@myrealCRONTABDIR@'; // Server definition template |
Update of /cvsroot/bobs/bobs In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv25059/bobs Modified Files: FILES INSTALL Makefile.am Makefile.in bobs.spec configure configure.in systemcheck.php Added Files: RELEASE-NOTES Log Message: Start cmdloop from /etc/init.d/cmdloopd instead of using check_loop in /etc/crontab. --- NEW FILE: RELEASE-NOTES --- RELEASE NOTES IMPORTANT! If you are upgrading from release 0.6.1 or earlier, or from a cvs version prior to 03-27-2004, you must uninstall bobs before configuring or installing a newer release. Uninstalling bobs following one of the methods below will not erase your configuration data or backups. To uninstall a bobs rpm: su rpm -e bobs To uninstall a bobs tgz distribution: Change to the directory where you untarred bobs. su make uninstall This is necessary because of the way cmdloop gets started. cmdloop is now started from /etc/init.d/cmdloopd instead /etc/crontab. If you fail to uninstall bobs before installing a new version, then do the following steps: o su - o Edit /etc/crontab and remove the check_loop entry. o killall cmdloop o Start the new cmdloop by typing: /etc/init.d/cmdloopd start ---------- bobs release 0.6.2 cmdloop is now started from /etc/init.d/cmdloopd. It should start automatically. To start it manually, become root and type '/etc/init.d/cmdloopd start'. To stop it manually, become root and type '/etc/init.d/cmdloopd stop'. Output from cmdloop is now written to a log, usually /var/log/bobs.log. This log is not rotated automatically so you may want to delete it, rotate it manually, or setup automatic log rotation. To setup log rotation see 'man logrotate'. Index: FILES =================================================================== RCS file: /cvsroot/bobs/bobs/FILES,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- FILES 1 Sep 2002 02:22:07 -0000 1.2 +++ FILES 28 Mar 2004 22:33:21 -0000 1.3 @@ -8,6 +8,6 @@ directory. -cron/check_loop Cron script that starts the cmdloop script. +bash/init.d/cmdloopd Script that starts the cmdloop script. inc/list.php Class documentation and examples for selectlist class. Index: INSTALL =================================================================== RCS file: /cvsroot/bobs/bobs/INSTALL,v retrieving revision 1.23 retrieving revision 1.24 diff -u -d -r1.23 -r1.24 --- INSTALL 9 May 2003 05:39:53 -0000 1.23 +++ INSTALL 28 Mar 2004 22:33:21 -0000 1.24 @@ -356,10 +356,8 @@ /var/www/html/bobs Bobs web pages -/etc/crontab A line is added to /etc/crontab that - starts the backup command loop script if it's - not already running. - 0-59/5 * * * * root /var/bobsdata/current/process/check_loop +/etc/init.d/cmdloopd + Starts the cmdloop script. /etc/cron.daily/backup.php This is the script that runs the backups once Index: Makefile.am =================================================================== RCS file: /cvsroot/bobs/bobs/Makefile.am,v retrieving revision 1.15 retrieving revision 1.16 diff -u -d -r1.15 -r1.16 --- Makefile.am 9 May 2003 05:39:53 -0000 1.15 +++ Makefile.am 28 Mar 2004 22:33:21 -0000 1.16 @@ -32,7 +32,7 @@ dist_html_DATA = $(wildcard *.php *.css) -EXTRA_DIST = bobs.spec config.patch backup.patch check_loop.patch \ +EXTRA_DIST = bobs.spec config.patch backup.patch cmdloopd.patch \ FILES LICENSE VERSION # @@ -68,8 +68,8 @@ backup.patch: -diff -uN cron/backup.php.in cron/backup.php > backup.patch -check_loop.patch: - -diff -uN cron/check_loop.in cron/check_loop > check_loop.patch +cmdloopd.patch: + -diff -uN bash/init.d/cmdloopd.in bash/init.d/cmdloopd > cmdloopd.patch install-data-local: @@ -88,10 +88,20 @@ # so make the httpd process own the directory if test -n "$(myHTTPDUSER)"; then \ - chown -R $(myHTTPDUSER) $(myBOBSDATA) \ + chown $(myHTTPDUSER) $(myBOBSDATA)/current; \ + chown $(myHTTPDUSER) $(myBOBSDATA)/incoming; \ + chown $(myHTTPDUSER) $(myBOBSDATA)/incremental; \ + chown $(myHTTPDUSER) $(myBOBSDATA)/admin.pwd; \ + chown -R $(myHTTPDUSER) $(myBOBSDATA)/current/process \ || echo "** Please run 'chown -R $(myHTTPDUSER) $(myBOBSDATA)'"; \ fi +# Start cmdloopd + +install-data-hook: + + -$(myrealSYSCONFDIR)/init.d/cmdloopd start + # Remove some other crap for 'make distclean' distclean-local: Index: Makefile.in =================================================================== RCS file: /cvsroot/bobs/bobs/Makefile.in,v retrieving revision 1.13 retrieving revision 1.14 diff -u -d -r1.13 -r1.14 --- Makefile.in 9 May 2003 05:39:53 -0000 1.13 +++ Makefile.in 28 Mar 2004 22:33:21 -0000 1.14 @@ -82,14 +82,16 @@ install_sh = @install_sh@ myBOBSDATA = @myBOBSDATA@ myCRONDIR = @myCRONDIR@ -myCRONTABDIR = @myCRONTABDIR@ myHTTPDUSER = @myHTTPDUSER@ +myLOGDIR = @myLOGDIR@ myMANDIR = @myMANDIR@ myPASS = @myPASS@ +mySYSCONFDIR = @mySYSCONFDIR@ myWEBDIR = @myWEBDIR@ myrealBOBSDATA = @myrealBOBSDATA@ myrealCRONDIR = @myrealCRONDIR@ -myrealCRONTABDIR = @myrealCRONTABDIR@ +myrealLOGDIR = @myrealLOGDIR@ +myrealSYSCONFDIR = @myrealSYSCONFDIR@ myrealWEBDIR = @myrealWEBDIR@ SUBDIRS = bash data doc cron images inc js man winc @@ -104,7 +106,7 @@ # The 'dist_' prefix tells 'make dist' to distribute these files. dist_html_DATA = $(wildcard *.php *.css) -EXTRA_DIST = bobs.spec config.patch backup.patch check_loop.patch \ +EXTRA_DIST = bobs.spec config.patch backup.patch cmdloopd.patch \ FILES LICENSE VERSION @@ -299,7 +301,7 @@ distdir: $(DISTFILES) $(am__remove_distdir) mkdir $(distdir) - $(mkinstalldirs) $(distdir)/cron $(distdir)/data $(distdir)/inc + $(mkinstalldirs) $(distdir)/bash/init.d $(distdir)/cron $(distdir)/data $(distdir)/inc @list='$(DISTFILES)'; for file in $$list; do \ if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ @@ -435,6 +437,8 @@ info-am: install-data-am: install-data-local install-dist_htmlDATA + @$(NORMAL_INSTALL) + $(MAKE) $(AM_MAKEFLAGS) install-data-hook install-exec-am: @@ -489,8 +493,8 @@ backup.patch: -diff -uN cron/backup.php.in cron/backup.php > backup.patch -check_loop.patch: - -diff -uN cron/check_loop.in cron/check_loop > check_loop.patch +cmdloopd.patch: + -diff -uN bash/init.d/cmdloopd.in bash/init.d/cmdloopd > cmdloopd.patch install-data-local: @@ -509,10 +513,20 @@ # so make the httpd process own the directory if test -n "$(myHTTPDUSER)"; then \ - chown -R $(myHTTPDUSER) $(myBOBSDATA) \ + chown $(myHTTPDUSER) $(myBOBSDATA)/current; \ + chown $(myHTTPDUSER) $(myBOBSDATA)/incoming; \ + chown $(myHTTPDUSER) $(myBOBSDATA)/incremental; \ + chown $(myHTTPDUSER) $(myBOBSDATA)/admin.pwd; \ + chown -R $(myHTTPDUSER) $(myBOBSDATA)/current/process \ || echo "** Please run 'chown -R $(myHTTPDUSER) $(myBOBSDATA)'"; \ fi +# Start cmdloopd + +install-data-hook: + + -$(myrealSYSCONFDIR)/init.d/cmdloopd start + # Remove some other crap for 'make distclean' distclean-local: Index: bobs.spec =================================================================== RCS file: /cvsroot/bobs/bobs/bobs.spec,v retrieving revision 1.6 retrieving revision 1.7 diff -u -d -r1.6 -r1.7 --- bobs.spec 7 Feb 2004 23:22:30 -0000 1.6 +++ bobs.spec 28 Mar 2004 22:33:21 -0000 1.7 @@ -10,7 +10,7 @@ Requires: sed, php, bash, rsync, portmap Patch0: config.patch Patch1: backup.patch -Patch2: check_loop.patch +Patch2: cmdloopd.patch %description Browseable Online Backup System (BOBS) is a complete online backup system. @@ -24,7 +24,7 @@ patch inc/config.php.in config.patch patch cron/backup.php.in backup.patch -patch cron/check_loop.in check_loop.patch +patch bash/init.d/cmdloopd.in cmdloopd.patch %build ./configure --prefix=$RPM_BUILD_ROOT @@ -36,28 +36,12 @@ rm -rf $RPM_BUILD_ROOT %post -# Install the cron job -# Backup crontab, copy back all but check_loop, -# then Add check_loop - if test -f %{_sysconfdir}/crontab; then \ - cp -vp %{_sysconfdir}/crontab %{_sysconfdir}/crontab.bak; \ - grep -v current/process/check_loop \ - %{_sysconfdir}/crontab.bak > %{_sysconfdir}/crontab; \ - echo '0-59/5 * * * * root /var/bobsdata/current/process/check_loop' \ - >> %{_sysconfdir}/crontab; \ - fi +/etc/init.d/cmdloopd start %postun -# Uninstall the cron job -# Backup crontab and copy back all but check_loop - if test -f %{_sysconfdir}/crontab; then \ - cp -vp %{_sysconfdir}/crontab %{_sysconfdir}/crontab.bak; \ - grep -v current/process/check_loop \ - %{_sysconfdir}/crontab.bak > %{_sysconfdir}/crontab; \ - fi - %preun +/etc/init.d/cmdloopd stop || echo "cmdloop not stopped." %files @@ -66,6 +50,7 @@ /var/www/html/bobs/ /etc/cron.daily/backup.php +/etc/init.d/cmdloopd /usr/man/man1/bobs.1.gz %defattr(-, %{HTTPDUSER}, root) @@ -73,10 +58,12 @@ /var/bobsdata %changelog +* Sun Mar 28 2004 Joe Zacky <jz...@us...> +- Remove check_loop from crontab and use /etc/init.d/cmdloopd. * Sat Feb 7 2004 Jochen Metzger <jme...@us...> - Added backup method rsync over secure shell. * Sun Jun 22 2003 Joe Zacky <jz...@at...> - Release 0.6.0 * Tue Oct 15 2002 Rene Rask <re...@gr...> - Initial RPM release. - + Index: configure =================================================================== RCS file: /cvsroot/bobs/bobs/configure,v retrieving revision 1.13 retrieving revision 1.14 diff -u -d -r1.13 -r1.14 --- configure 7 Feb 2004 23:22:30 -0000 1.13 +++ configure 28 Mar 2004 22:33:21 -0000 1.14 @@ -272,7 +272,7 @@ ac_unique_file="admin.php" ac_default_prefix='' -ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO AMTAR install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM AWK SET_MAKE myWEBDIR myBOBSDATA myCRONDIR myCRONTABDIR myMANDIR myPASS myHTTPDUSER myrealBOBSDATA myrealWEBDIR myrealCRONDIR myrealCRONTABDIR LIBOBJS LTLIBOBJS' +ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO AMTAR install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM AWK SET_MAKE myWEBDIR myBOBSDATA myCRONDIR myMANDIR myLOGDIR mySYSCONFDIR myPASS myHTTPDUSER myrealBOBSDATA myrealWEBDIR myrealCRONDIR myrealLOGDIR myrealSYSCONFDIR LIBOBJS LTLIBOBJS' ac_subst_files='' # Initialize some variables set by options. @@ -1728,11 +1728,13 @@ myPASS=$(echo '<?php echo crypt("admin"); ?>' | php | tail -n 1) -myCRONTABDIR=${sysconfdir} +myMANDIR='${prefix}'/usr/man -myMANDIR='${prefix}'/usr/man +myLOGDIR='${localstatedir}'/log + +mySYSCONFDIR='${sysconfdir}' @@ -1745,7 +1747,9 @@ - ac_config_files="$ac_config_files Makefile bash/Makefile cron/Makefile data/Makefile doc/Makefile images/Makefile images/bar/Makefile images/menu/Makefile inc/Makefile inc/excludes/Makefile inc/servers/Makefile inc/templates/Makefile js/Makefile man/Makefile winc/Makefile" + + + ac_config_files="$ac_config_files Makefile bash/Makefile bash/init.d/Makefile cron/Makefile data/Makefile doc/Makefile images/Makefile images/bar/Makefile images/menu/Makefile inc/Makefile inc/excludes/Makefile inc/servers/Makefile inc/templates/Makefile js/Makefile man/Makefile winc/Makefile" @@ -1767,13 +1771,19 @@ )` -myrealCRONTABDIR=`( +myrealLOGDIR=`( test "x$prefix" = xNONE && prefix=$ac_default_prefix - eval echo "$myCRONTABDIR" + eval echo $(eval echo "$myLOGDIR") )` - ac_config_files="$ac_config_files inc/config.php data/admin.pwd cron/backup.php cron/check_loop" +myrealSYSCONFDIR=`( + test "x$prefix" = xNONE && prefix=$ac_default_prefix + eval echo $(eval echo "$mySYSCONFDIR") +)` + + + ac_config_files="$ac_config_files inc/config.php data/admin.pwd cron/backup.php bash/init.d/cmdloopd" cat >confcache <<\_ACEOF # This file is a shell script that caches the results of configure # tests run on this system so they can be shared between configure @@ -2326,6 +2336,7 @@ # Handling of arguments. "Makefile" ) CONFIG_FILES="$CONFIG_FILES Makefile" ;; "bash/Makefile" ) CONFIG_FILES="$CONFIG_FILES bash/Makefile" ;; + "bash/init.d/Makefile" ) CONFIG_FILES="$CONFIG_FILES bash/init.d/Makefile" ;; "cron/Makefile" ) CONFIG_FILES="$CONFIG_FILES cron/Makefile" ;; "data/Makefile" ) CONFIG_FILES="$CONFIG_FILES data/Makefile" ;; "doc/Makefile" ) CONFIG_FILES="$CONFIG_FILES doc/Makefile" ;; @@ -2342,7 +2353,7 @@ "inc/config.php" ) CONFIG_FILES="$CONFIG_FILES inc/config.php" ;; "data/admin.pwd" ) CONFIG_FILES="$CONFIG_FILES data/admin.pwd" ;; "cron/backup.php" ) CONFIG_FILES="$CONFIG_FILES cron/backup.php" ;; - "cron/check_loop" ) CONFIG_FILES="$CONFIG_FILES cron/check_loop" ;; + "bash/init.d/cmdloopd" ) CONFIG_FILES="$CONFIG_FILES bash/init.d/cmdloopd" ;; *) { { echo "$as_me:$LINENO: error: invalid argument: $ac_config_target" >&5 echo "$as_me: error: invalid argument: $ac_config_target" >&2;} { (exit 1); exit 1; }; };; @@ -2446,14 +2457,16 @@ s,@myWEBDIR@,$myWEBDIR,;t t s,@myBOBSDATA@,$myBOBSDATA,;t t s,@myCRONDIR@,$myCRONDIR,;t t -s,@myCRONTABDIR@,$myCRONTABDIR,;t t s,@myMANDIR@,$myMANDIR,;t t +s,@myLOGDIR@,$myLOGDIR,;t t +s,@mySYSCONFDIR@,$mySYSCONFDIR,;t t s,@myPASS@,$myPASS,;t t s,@myHTTPDUSER@,$myHTTPDUSER,;t t s,@myrealBOBSDATA@,$myrealBOBSDATA,;t t s,@myrealWEBDIR@,$myrealWEBDIR,;t t s,@myrealCRONDIR@,$myrealCRONDIR,;t t -s,@myrealCRONTABDIR@,$myrealCRONTABDIR,;t t +s,@myrealLOGDIR@,$myrealLOGDIR,;t t +s,@myrealSYSCONFDIR@,$myrealSYSCONFDIR,;t t s,@LIBOBJS@,$LIBOBJS,;t t s,@LTLIBOBJS@,$LTLIBOBJS,;t t CEOF @@ -2699,7 +2712,7 @@ echo -n " web pages directory = "; eval echo $myWEBDIR echo -n " bobs data directory = "; eval echo $myBOBSDATA echo -n " cron directory = "; eval echo $myCRONDIR -echo -n " crontab directory = "; eval echo $myCRONTABDIR +echo " log directory = $myrealLOGDIR"; echo " admin password = admin" echo "" echo "*** $WARNCOUNT warning(s)" Index: configure.in =================================================================== RCS file: /cvsroot/bobs/bobs/configure.in,v retrieving revision 1.15 retrieving revision 1.16 diff -u -d -r1.15 -r1.16 --- configure.in 7 Feb 2004 23:22:30 -0000 1.15 +++ configure.in 28 Mar 2004 22:33:21 -0000 1.16 @@ -11,6 +11,8 @@ dnl> This is how I am currently building the package: dnl> aclocal;autoconf;automake --add-missing;./configure dnl> 02-03-2003 Provide destination for crontab for 'make rpm'. +dnl> 03-16-2004 Do not modify /etc/crontab, instead start cmdloop as +dnl> a service. PACKAGE=bobs VERSION=0.6.1 @@ -93,16 +95,22 @@ myPASS=$(echo '<?php echo crypt("admin"); ?>' | php | tail -n 1) dnl> -dnl> Location of crontab file +dnl> Location of man pages dnl> -myCRONTABDIR=${sysconfdir} +myMANDIR='${prefix}'/usr/man dnl> -dnl> Location of man pages +dnl> Location of log directory dnl> -myMANDIR='${prefix}'/usr/man +myLOGDIR='${localstatedir}'/log + +dnl> +dnl> Location of configuration files +dnl> + +mySYSCONFDIR='${sysconfdir}' dnl> dnl> The following variables will will be substituted with their @@ -112,8 +120,9 @@ AC_SUBST(myWEBDIR) AC_SUBST(myBOBSDATA) AC_SUBST(myCRONDIR) -AC_SUBST(myCRONTABDIR) AC_SUBST(myMANDIR) +AC_SUBST(myLOGDIR) +AC_SUBST(mySYSCONFDIR) AC_SUBST(myPASS) AC_SUBST(myHTTPDUSER) AC_SUBST(PACKAGE) @@ -126,6 +135,7 @@ AC_CONFIG_FILES([ Makefile bash/Makefile +bash/init.d/Makefile cron/Makefile data/Makefile doc/Makefile @@ -163,17 +173,23 @@ )` AC_SUBST(myrealCRONDIR) -myrealCRONTABDIR=`( +myrealLOGDIR=`( test "x$prefix" = xNONE && prefix=$ac_default_prefix - eval echo "$myCRONTABDIR" + eval echo $(eval echo "$myLOGDIR") )` -AC_SUBST(myrealCRONTABDIR) +AC_SUBST(myrealLOGDIR) + +myrealSYSCONFDIR=`( + test "x$prefix" = xNONE && prefix=$ac_default_prefix + eval echo $(eval echo "$mySYSCONFDIR") +)` +AC_SUBST(myrealSYSCONFDIR) AC_OUTPUT([ inc/config.php data/admin.pwd cron/backup.php -cron/check_loop +bash/init.d/cmdloopd ]) dnl> @@ -186,7 +202,7 @@ echo -n " web pages directory = "; eval echo $myWEBDIR echo -n " bobs data directory = "; eval echo $myBOBSDATA echo -n " cron directory = "; eval echo $myCRONDIR -echo -n " crontab directory = "; eval echo $myCRONTABDIR +echo " log directory = $myrealLOGDIR"; echo " admin password = admin" echo "" echo "*** $WARNCOUNT warning(s)" @@ -201,6 +217,5 @@ dnl> echo "myBOBSDATA: ${myBOBSDATA}" dnl> echo "myrealBOBSDATA: ${myrealBOBSDATA}" dnl> echo "myCRONDIR: ${myCRONDIR}" -dnl> echo "myCRONTABDIR: ${myCRONTABDIR}" dnl> THE END Index: systemcheck.php =================================================================== RCS file: /cvsroot/bobs/bobs/systemcheck.php,v retrieving revision 1.7 retrieving revision 1.8 diff -u -d -r1.7 -r1.8 --- systemcheck.php 26 Mar 2004 21:33:51 -0000 1.7 +++ systemcheck.php 28 Mar 2004 22:33:21 -0000 1.8 @@ -206,62 +206,9 @@ } // -------------------------------- -// Check crontab +// Check cmdloop // -------------------------------- -$crontabdir = $config->get_crontabdir(); -$t->assign ('ITEM', "The crontab directory is $crontabdir"); -if (strlen($crontabdir) <= 0){ - $t->assign ('STATUS', 'FAIL'); - $t->assign ('HELP', "The location of the crontab file has not been set.<br> - This is usually /etc.<br> - Reinstall bobs and manually specify --with-crontabdir=DIR<br> - if it is not set automatically."); - putfail(); -} else { - $t->assign ('STATUS', 'PASS'); - putpass(); -} - -$crontab = $crontabdir . '/crontab'; -$t->assign ('ITEM', "Checking for $crontab"); -if (is_file($crontab)) { - $t->assign ('STATUS', 'PASS'); - putpass(); -} else { - $t->assign ('STATUS', 'FAIL'); - $t->assign ('HELP', "I can't find $crontab. What the heck?!"); - putfail(); -} - -$cronline = `grep 'current/process/check_loop' $crontab`; -if (strlen($cronline) > 0) { - $t->assign ('ITEM', "Checking for check_loop in $crontab<br> - $cronline"); - $t->assign ('STATUS', 'PASS'); - putpass(); -} else { - $t->assign ('ITEM', "Checking for check_loop in $crontab"); - $t->assign ('STATUS', 'FAIL'); - $t->assign ('HELP', "check_loop doesn't seem to be in $crontab.<br> - Reinstall bobs."); - putfail(); -} - -$pid = `/sbin/pidof -x check_loop`; -if (strlen($pid) > 0) { - $t->assign ('ITEM', "Checking for running check_loop process<br> - check_loop process id is $pid"); - $t->assign ('STATUS', 'PASS'); - putpass(); -} else { - $t->assign ('ITEM', "Checking for running check_loop process"); - $t->assign ('STATUS', 'FAIL'); - $t->assign ('HELP', "check_loop doesn't seem to be running.<br> - See $crontab and/or reinstall bobs."); - putfail(); -} - $pid = rtrim(`/sbin/pidof -x cmdloop`); if (strlen($pid) > 0) { $t->assign ('ITEM', "Checking for running cmdloop process<br> @@ -272,8 +219,8 @@ $t->assign ('ITEM', "Checking for running cmdloop process"); $t->assign ('STATUS', 'FAIL'); $t->assign ('HELP', "cmdloop doesn't seem to be running.<br> - If you just installed bobs, wait 5 minutes and check again,<br> - otherwise see $crontab and/or reinstall bobs."); + Try running this command as root:<br> + /etc/init.d/cmdloopd start"); putfail(); } |
|
From: Joe Z. <jz...@us...> - 2004-03-28 22:44:44
|
Update of /cvsroot/bobs/bobs/bash In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv25059/bobs/bash Modified Files: Makefile.am Makefile.in cmdloop Log Message: Start cmdloop from /etc/init.d/cmdloopd instead of using check_loop in /etc/crontab. Index: Makefile.am =================================================================== RCS file: /cvsroot/bobs/bobs/bash/Makefile.am,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- Makefile.am 22 Dec 2002 02:30:32 -0000 1.1 +++ Makefile.am 28 Mar 2004 22:33:22 -0000 1.2 @@ -1,3 +1,4 @@ +SUBDIRS = init.d # install to to bobs script directory Index: Makefile.in =================================================================== RCS file: /cvsroot/bobs/bobs/bash/Makefile.in,v retrieving revision 1.4 retrieving revision 1.5 diff -u -d -r1.4 -r1.5 --- Makefile.in 24 Apr 2003 06:15:57 -0000 1.4 +++ Makefile.in 28 Mar 2004 22:33:22 -0000 1.5 @@ -13,8 +13,6 @@ # PARTICULAR PURPOSE. @SET_MAKE@ - -# install to to bobs script directory SHELL = @SHELL@ srcdir = @srcdir@ @@ -77,16 +75,21 @@ install_sh = @install_sh@ myBOBSDATA = @myBOBSDATA@ myCRONDIR = @myCRONDIR@ -myCRONTABDIR = @myCRONTABDIR@ myHTTPDUSER = @myHTTPDUSER@ +myLOGDIR = @myLOGDIR@ myMANDIR = @myMANDIR@ myPASS = @myPASS@ +mySYSCONFDIR = @mySYSCONFDIR@ myWEBDIR = @myWEBDIR@ myrealBOBSDATA = @myrealBOBSDATA@ myrealCRONDIR = @myrealCRONDIR@ -myrealCRONTABDIR = @myrealCRONTABDIR@ +myrealLOGDIR = @myrealLOGDIR@ +myrealSYSCONFDIR = @myrealSYSCONFDIR@ myrealWEBDIR = @myrealWEBDIR@ +SUBDIRS = init.d + +# install to to bobs script directory processdir = $(myBOBSDATA)/current/process dist_process_SCRIPTS = cmdloop @@ -96,8 +99,14 @@ SCRIPTS = $(dist_process_SCRIPTS) DIST_SOURCES = + +RECURSIVE_TARGETS = info-recursive dvi-recursive install-info-recursive \ + uninstall-info-recursive all-recursive install-data-recursive \ + install-exec-recursive installdirs-recursive install-recursive \ + uninstall-recursive check-recursive installcheck-recursive DIST_COMMON = $(dist_process_SCRIPTS) Makefile.am Makefile.in -all: all-am +DIST_SUBDIRS = $(SUBDIRS) +all: all-recursive .SUFFIXES: $(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) @@ -126,9 +135,102 @@ rm -f $(DESTDIR)$(processdir)/$$f; \ done uninstall-info-am: + +# This directory's subdirectories are mostly independent; you can cd +# into them and run `make' without going through this Makefile. +# To change the values of `make' variables: instead of editing Makefiles, +# (1) if the variable is set in `config.status', edit `config.status' +# (which will cause the Makefiles to be regenerated when you run `make'); +# (2) otherwise, pass the desired values on the `make' command line. +$(RECURSIVE_TARGETS): + @set fnord $$MAKEFLAGS; amf=$$2; \ + dot_seen=no; \ + target=`echo $@ | sed s/-recursive//`; \ + list='$(SUBDIRS)'; for subdir in $$list; do \ + echo "Making $$target in $$subdir"; \ + if test "$$subdir" = "."; then \ + dot_seen=yes; \ + local_target="$$target-am"; \ + else \ + local_target="$$target"; \ + fi; \ + (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ + || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \ + done; \ + if test "$$dot_seen" = "no"; then \ + $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \ + fi; test -z "$$fail" + +mostlyclean-recursive clean-recursive distclean-recursive \ +maintainer-clean-recursive: + @set fnord $$MAKEFLAGS; amf=$$2; \ + dot_seen=no; \ + case "$@" in \ + distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \ + *) list='$(SUBDIRS)' ;; \ + esac; \ + rev=''; for subdir in $$list; do \ + if test "$$subdir" = "."; then :; else \ + rev="$$subdir $$rev"; \ + fi; \ + done; \ + rev="$$rev ."; \ + target=`echo $@ | sed s/-recursive//`; \ + for subdir in $$rev; do \ + echo "Making $$target in $$subdir"; \ + if test "$$subdir" = "."; then \ + local_target="$$target-am"; \ + else \ + local_target="$$target"; \ + fi; \ + (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ + || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \ + done && test -z "$$fail" +tags-recursive: + list='$(SUBDIRS)'; for subdir in $$list; do \ + test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \ + done + +ETAGS = etags +ETAGSFLAGS = + tags: TAGS -TAGS: +ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) + list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ + mkid -fID $$unique + +TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ + $(TAGS_FILES) $(LISP) + tags=; \ + here=`pwd`; \ + list='$(SUBDIRS)'; for subdir in $$list; do \ + if test "$$subdir" = .; then :; else \ + test -f $$subdir/TAGS && tags="$$tags -i $$here/$$subdir/TAGS"; \ + fi; \ + done; \ + list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ + test -z "$(ETAGS_ARGS)$$tags$$unique" \ + || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ + $$tags $$unique + +GTAGS: + here=`$(am__cd) $(top_builddir) && pwd` \ + && cd $(top_srcdir) \ + && gtags -i $(GTAGS_ARGS) $$here + +distclean-tags: + -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) top_distdir = .. @@ -155,22 +257,35 @@ || exit 1; \ fi; \ done + list='$(SUBDIRS)'; for subdir in $$list; do \ + if test "$$subdir" = .; then :; else \ + test -d $(distdir)/$$subdir \ + || mkdir $(distdir)/$$subdir \ + || exit 1; \ + (cd $$subdir && \ + $(MAKE) $(AM_MAKEFLAGS) \ + top_distdir="$(top_distdir)" \ + distdir=../$(distdir)/$$subdir \ + distdir) \ + || exit 1; \ + fi; \ + done check-am: all-am -check: check-am +check: check-recursive all-am: Makefile $(SCRIPTS) - -installdirs: +installdirs: installdirs-recursive +installdirs-am: $(mkinstalldirs) $(DESTDIR)$(processdir) -install: install-am -install-exec: install-exec-am -install-data: install-data-am -uninstall: uninstall-am +install: install-recursive +install-exec: install-exec-recursive +install-data: install-data-recursive +uninstall: uninstall-recursive install-am: all-am @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am -installcheck: installcheck-am +installcheck: installcheck-recursive install-strip: $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ INSTALL_STRIP_FLAG=-s \ @@ -186,19 +301,19 @@ maintainer-clean-generic: @echo "This command is intended for maintainers to use" @echo "it deletes files that may require special tools to rebuild." -clean: clean-am +clean: clean-recursive clean-am: clean-generic mostlyclean-am -distclean: distclean-am +distclean: distclean-recursive -distclean-am: clean-am distclean-generic +distclean-am: clean-am distclean-generic distclean-tags -dvi: dvi-am +dvi: dvi-recursive dvi-am: -info: info-am +info: info-recursive info-am: @@ -206,31 +321,38 @@ install-exec-am: -install-info: install-info-am +install-info: install-info-recursive install-man: installcheck-am: -maintainer-clean: maintainer-clean-am +maintainer-clean: maintainer-clean-recursive maintainer-clean-am: distclean-am maintainer-clean-generic -mostlyclean: mostlyclean-am +mostlyclean: mostlyclean-recursive mostlyclean-am: mostlyclean-generic uninstall-am: uninstall-dist_processSCRIPTS uninstall-info-am -.PHONY: all all-am check check-am clean clean-generic distclean \ - distclean-generic distdir dvi dvi-am info info-am install \ - install-am install-data install-data-am \ +uninstall-info: uninstall-info-recursive + +.PHONY: $(RECURSIVE_TARGETS) GTAGS all all-am check check-am clean \ + clean-generic clean-recursive distclean distclean-generic \ + distclean-recursive distclean-tags distdir dvi dvi-am \ + dvi-recursive info info-am info-recursive install install-am \ + install-data install-data-am install-data-recursive \ install-dist_processSCRIPTS install-exec install-exec-am \ - install-info install-info-am install-man install-strip \ - installcheck installcheck-am installdirs maintainer-clean \ - maintainer-clean-generic mostlyclean mostlyclean-generic \ + install-exec-recursive install-info install-info-am \ + install-info-recursive install-man install-recursive \ + install-strip installcheck installcheck-am installdirs \ + installdirs-am installdirs-recursive maintainer-clean \ + maintainer-clean-generic maintainer-clean-recursive mostlyclean \ + mostlyclean-generic mostlyclean-recursive tags tags-recursive \ uninstall uninstall-am uninstall-dist_processSCRIPTS \ - uninstall-info-am + uninstall-info-am uninstall-info-recursive uninstall-recursive # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. Index: cmdloop =================================================================== RCS file: /cvsroot/bobs/bobs/bash/cmdloop,v retrieving revision 1.5 retrieving revision 1.6 diff -u -d -r1.5 -r1.6 --- cmdloop 23 Apr 2003 01:41:21 -0000 1.5 +++ cmdloop 28 Mar 2004 22:33:22 -0000 1.6 @@ -18,14 +18,14 @@ do if [ -e $file ] then - echo "Starting $file" + echo "$(date +'%Y-%m-%d %H:%M:%S'): Starting $file" # ${file##*.} resolves to the extension of the file name # File name 'cmd.1048828727.bash' resolves to just 'bash' # See 'parameter expansion' in 'info bash' ${file##*.} $file $DELCMD $file - echo "Finished $file" + echo "$(date +'%Y-%m-%d %H:%M:%S'): Finished $file" else continue fi |
|
From: Joe Z. <jz...@us...> - 2004-03-28 22:44:44
|
Update of /cvsroot/bobs/bobs/cron In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv25059/bobs/cron Modified Files: Makefile.am Makefile.in Removed Files: check_loop.in Log Message: Start cmdloop from /etc/init.d/cmdloopd instead of using check_loop in /etc/crontab. Index: Makefile.am =================================================================== RCS file: /cvsroot/bobs/bobs/cron/Makefile.am,v retrieving revision 1.4 retrieving revision 1.5 diff -u -d -r1.4 -r1.5 --- Makefile.am 24 Mar 2003 05:39:58 -0000 1.4 +++ Makefile.am 28 Mar 2004 22:33:22 -0000 1.5 @@ -5,44 +5,4 @@ cron_SCRIPTS = backup.php -# install to bobs script directory - -processdir = $(myBOBSDATA)/current/process - -process_SCRIPTS = check_loop - -install-data-local: - -# -# This section contains things to do during 'make install' -# - -# Add 'check_loop' to crontab - -# Make the crontab directory (for testing distribution with 'make distcheck') - $(top_srcdir)/mkinstalldirs $(myCRONTABDIR) - -# backup crontab -# Copy back all but check_loop -# Add check_loop - if test -f "$(myCRONTABDIR)/crontab"; then \ - cp -vp $(myCRONTABDIR)/crontab $(myCRONTABDIR)/crontab.bak; \ - grep -v current/process/check_loop \ - $(myCRONTABDIR)/crontab.bak > $(myCRONTABDIR)/crontab; \ - echo '0-59/5 * * * * root $(myBOBSDATA)/current/process/check_loop' \ - >> $(myCRONTABDIR)/crontab; \ - fi - -# Remove 'check_loop' from crontab - -uninstall-local: - -# backup crontab -# Copy back all but check_loop - if test -f "$(myCRONTABDIR)/crontab"; then \ - cp -vp $(myCRONTABDIR)/crontab $(myCRONTABDIR)/crontab.bak; \ - grep -v current/process/check_loop $(myCRONTABDIR)/crontab.bak \ - > $(myCRONTABDIR)/crontab; \ - fi - # END Index: Makefile.in =================================================================== RCS file: /cvsroot/bobs/bobs/cron/Makefile.in,v retrieving revision 1.5 retrieving revision 1.6 diff -u -d -r1.5 -r1.6 --- Makefile.in 24 Apr 2003 06:15:57 -0000 1.5 +++ Makefile.in 28 Mar 2004 22:33:22 -0000 1.6 @@ -77,32 +77,28 @@ install_sh = @install_sh@ myBOBSDATA = @myBOBSDATA@ myCRONDIR = @myCRONDIR@ -myCRONTABDIR = @myCRONTABDIR@ myHTTPDUSER = @myHTTPDUSER@ +myLOGDIR = @myLOGDIR@ myMANDIR = @myMANDIR@ myPASS = @myPASS@ +mySYSCONFDIR = @mySYSCONFDIR@ myWEBDIR = @myWEBDIR@ myrealBOBSDATA = @myrealBOBSDATA@ myrealCRONDIR = @myrealCRONDIR@ -myrealCRONTABDIR = @myrealCRONTABDIR@ +myrealLOGDIR = @myrealLOGDIR@ +myrealSYSCONFDIR = @myrealSYSCONFDIR@ myrealWEBDIR = @myrealWEBDIR@ crondir = $(myCRONDIR) cron_SCRIPTS = backup.php - - -# install to bobs script directory -processdir = $(myBOBSDATA)/current/process - -process_SCRIPTS = check_loop subdir = cron mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs -CONFIG_CLEAN_FILES = backup.php check_loop -SCRIPTS = $(cron_SCRIPTS) $(process_SCRIPTS) +CONFIG_CLEAN_FILES = backup.php +SCRIPTS = $(cron_SCRIPTS) DIST_SOURCES = -DIST_COMMON = Makefile.am Makefile.in backup.php.in check_loop.in +DIST_COMMON = Makefile.am Makefile.in backup.php.in all: all-am .SUFFIXES: @@ -113,8 +109,6 @@ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe) backup.php: $(top_builddir)/config.status backup.php.in cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ -check_loop: $(top_builddir)/config.status check_loop.in - cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ cronSCRIPT_INSTALL = $(INSTALL_SCRIPT) install-cronSCRIPTS: $(cron_SCRIPTS) @$(NORMAL_INSTALL) @@ -135,26 +129,6 @@ echo " rm -f $(DESTDIR)$(crondir)/$$f"; \ rm -f $(DESTDIR)$(crondir)/$$f; \ done -processSCRIPT_INSTALL = $(INSTALL_SCRIPT) -install-processSCRIPTS: $(process_SCRIPTS) - @$(NORMAL_INSTALL) - $(mkinstalldirs) $(DESTDIR)$(processdir) - @list='$(process_SCRIPTS)'; for p in $$list; do \ - if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ - if test -f $$d$$p; then \ - f=`echo "$$p" | sed 's|^.*/||;$(transform)'`; \ - echo " $(processSCRIPT_INSTALL) $$d$$p $(DESTDIR)$(processdir)/$$f"; \ - $(processSCRIPT_INSTALL) $$d$$p $(DESTDIR)$(processdir)/$$f; \ - else :; fi; \ - done - -uninstall-processSCRIPTS: - @$(NORMAL_UNINSTALL) - @list='$(process_SCRIPTS)'; for p in $$list; do \ - f=`echo "$$p" | sed 's|^.*/||;$(transform)'`; \ - echo " rm -f $(DESTDIR)$(processdir)/$$f"; \ - rm -f $(DESTDIR)$(processdir)/$$f; \ - done uninstall-info-am: tags: TAGS TAGS: @@ -190,7 +164,7 @@ all-am: Makefile $(SCRIPTS) installdirs: - $(mkinstalldirs) $(DESTDIR)$(crondir) $(DESTDIR)$(processdir) + $(mkinstalldirs) $(DESTDIR)$(crondir) install: install-am install-exec: install-exec-am @@ -232,8 +206,7 @@ info-am: -install-data-am: install-cronSCRIPTS install-data-local \ - install-processSCRIPTS +install-data-am: install-cronSCRIPTS install-exec-am: @@ -251,54 +224,17 @@ mostlyclean-am: mostlyclean-generic -uninstall-am: uninstall-cronSCRIPTS uninstall-info-am uninstall-local \ - uninstall-processSCRIPTS +uninstall-am: uninstall-cronSCRIPTS uninstall-info-am .PHONY: all all-am check check-am clean clean-generic distclean \ distclean-generic distdir dvi dvi-am info info-am install \ install-am install-cronSCRIPTS install-data install-data-am \ - install-data-local install-exec install-exec-am install-info \ - install-info-am install-man install-processSCRIPTS \ - install-strip installcheck installcheck-am installdirs \ - maintainer-clean maintainer-clean-generic mostlyclean \ - mostlyclean-generic uninstall uninstall-am \ - uninstall-cronSCRIPTS uninstall-info-am uninstall-local \ - uninstall-processSCRIPTS - - -install-data-local: - -# -# This section contains things to do during 'make install' -# - -# Add 'check_loop' to crontab - -# Make the crontab directory (for testing distribution with 'make distcheck') - $(top_srcdir)/mkinstalldirs $(myCRONTABDIR) - -# backup crontab -# Copy back all but check_loop -# Add check_loop - if test -f "$(myCRONTABDIR)/crontab"; then \ - cp -vp $(myCRONTABDIR)/crontab $(myCRONTABDIR)/crontab.bak; \ - grep -v current/process/check_loop \ - $(myCRONTABDIR)/crontab.bak > $(myCRONTABDIR)/crontab; \ - echo '0-59/5 * * * * root $(myBOBSDATA)/current/process/check_loop' \ - >> $(myCRONTABDIR)/crontab; \ - fi - -# Remove 'check_loop' from crontab - -uninstall-local: + install-exec install-exec-am install-info install-info-am \ + install-man install-strip installcheck installcheck-am \ + installdirs maintainer-clean maintainer-clean-generic \ + mostlyclean mostlyclean-generic uninstall uninstall-am \ + uninstall-cronSCRIPTS uninstall-info-am -# backup crontab -# Copy back all but check_loop - if test -f "$(myCRONTABDIR)/crontab"; then \ - cp -vp $(myCRONTABDIR)/crontab $(myCRONTABDIR)/crontab.bak; \ - grep -v current/process/check_loop $(myCRONTABDIR)/crontab.bak \ - > $(myCRONTABDIR)/crontab; \ - fi # END # Tell versions [3.59,3.63) of GNU make to not export all variables. --- check_loop.in DELETED --- |
|
From: Joe Z. <jz...@us...> - 2004-03-28 22:44:44
|
Update of /cvsroot/bobs/bobs/images/menu In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv25059/bobs/images/menu Modified Files: Makefile.in Log Message: Start cmdloop from /etc/init.d/cmdloopd instead of using check_loop in /etc/crontab. Index: Makefile.in =================================================================== RCS file: /cvsroot/bobs/bobs/images/menu/Makefile.in,v retrieving revision 1.4 retrieving revision 1.5 diff -u -d -r1.4 -r1.5 --- Makefile.in 24 Apr 2003 06:15:58 -0000 1.4 +++ Makefile.in 28 Mar 2004 22:33:22 -0000 1.5 @@ -75,14 +75,16 @@ install_sh = @install_sh@ myBOBSDATA = @myBOBSDATA@ myCRONDIR = @myCRONDIR@ -myCRONTABDIR = @myCRONTABDIR@ myHTTPDUSER = @myHTTPDUSER@ +myLOGDIR = @myLOGDIR@ myMANDIR = @myMANDIR@ myPASS = @myPASS@ +mySYSCONFDIR = @mySYSCONFDIR@ myWEBDIR = @myWEBDIR@ myrealBOBSDATA = @myrealBOBSDATA@ myrealCRONDIR = @myrealCRONDIR@ -myrealCRONTABDIR = @myrealCRONTABDIR@ +myrealLOGDIR = @myrealLOGDIR@ +myrealSYSCONFDIR = @myrealSYSCONFDIR@ myrealWEBDIR = @myrealWEBDIR@ htmldir = $(myWEBDIR)/images/menu |
|
From: Joe Z. <jz...@us...> - 2004-03-28 22:44:44
|
Update of /cvsroot/bobs/bobs/inc/excludes In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv25059/bobs/inc/excludes Modified Files: Makefile.in Log Message: Start cmdloop from /etc/init.d/cmdloopd instead of using check_loop in /etc/crontab. Index: Makefile.in =================================================================== RCS file: /cvsroot/bobs/bobs/inc/excludes/Makefile.in,v retrieving revision 1.4 retrieving revision 1.5 diff -u -d -r1.4 -r1.5 --- Makefile.in 24 Apr 2003 06:15:59 -0000 1.4 +++ Makefile.in 28 Mar 2004 22:33:22 -0000 1.5 @@ -75,14 +75,16 @@ install_sh = @install_sh@ myBOBSDATA = @myBOBSDATA@ myCRONDIR = @myCRONDIR@ -myCRONTABDIR = @myCRONTABDIR@ myHTTPDUSER = @myHTTPDUSER@ +myLOGDIR = @myLOGDIR@ myMANDIR = @myMANDIR@ myPASS = @myPASS@ +mySYSCONFDIR = @mySYSCONFDIR@ myWEBDIR = @myWEBDIR@ myrealBOBSDATA = @myrealBOBSDATA@ myrealCRONDIR = @myrealCRONDIR@ -myrealCRONTABDIR = @myrealCRONTABDIR@ +myrealLOGDIR = @myrealLOGDIR@ +myrealSYSCONFDIR = @myrealSYSCONFDIR@ myrealWEBDIR = @myrealWEBDIR@ htmldir = $(myWEBDIR)/inc/excludes |
|
From: Joe Z. <jz...@us...> - 2004-03-28 22:44:43
|
Update of /cvsroot/bobs/bobs/images/bar In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv25059/bobs/images/bar Modified Files: Makefile.in Log Message: Start cmdloop from /etc/init.d/cmdloopd instead of using check_loop in /etc/crontab. Index: Makefile.in =================================================================== RCS file: /cvsroot/bobs/bobs/images/bar/Makefile.in,v retrieving revision 1.4 retrieving revision 1.5 diff -u -d -r1.4 -r1.5 --- Makefile.in 24 Apr 2003 06:15:58 -0000 1.4 +++ Makefile.in 28 Mar 2004 22:33:22 -0000 1.5 @@ -75,14 +75,16 @@ install_sh = @install_sh@ myBOBSDATA = @myBOBSDATA@ myCRONDIR = @myCRONDIR@ -myCRONTABDIR = @myCRONTABDIR@ myHTTPDUSER = @myHTTPDUSER@ +myLOGDIR = @myLOGDIR@ myMANDIR = @myMANDIR@ myPASS = @myPASS@ +mySYSCONFDIR = @mySYSCONFDIR@ myWEBDIR = @myWEBDIR@ myrealBOBSDATA = @myrealBOBSDATA@ myrealCRONDIR = @myrealCRONDIR@ -myrealCRONTABDIR = @myrealCRONTABDIR@ +myrealLOGDIR = @myrealLOGDIR@ +myrealSYSCONFDIR = @myrealSYSCONFDIR@ myrealWEBDIR = @myrealWEBDIR@ htmldir = $(myWEBDIR)/images/bar |
|
From: Joe Z. <jz...@us...> - 2004-03-28 22:44:43
|
Update of /cvsroot/bobs/bobs/images In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv25059/bobs/images Modified Files: Makefile.in Log Message: Start cmdloop from /etc/init.d/cmdloopd instead of using check_loop in /etc/crontab. Index: Makefile.in =================================================================== RCS file: /cvsroot/bobs/bobs/images/Makefile.in,v retrieving revision 1.4 retrieving revision 1.5 diff -u -d -r1.4 -r1.5 --- Makefile.in 24 Apr 2003 06:15:58 -0000 1.4 +++ Makefile.in 28 Mar 2004 22:33:22 -0000 1.5 @@ -75,14 +75,16 @@ install_sh = @install_sh@ myBOBSDATA = @myBOBSDATA@ myCRONDIR = @myCRONDIR@ -myCRONTABDIR = @myCRONTABDIR@ myHTTPDUSER = @myHTTPDUSER@ +myLOGDIR = @myLOGDIR@ myMANDIR = @myMANDIR@ myPASS = @myPASS@ +mySYSCONFDIR = @mySYSCONFDIR@ myWEBDIR = @myWEBDIR@ myrealBOBSDATA = @myrealBOBSDATA@ myrealCRONDIR = @myrealCRONDIR@ -myrealCRONTABDIR = @myrealCRONTABDIR@ +myrealLOGDIR = @myrealLOGDIR@ +myrealSYSCONFDIR = @myrealSYSCONFDIR@ myrealWEBDIR = @myrealWEBDIR@ SUBDIRS = bar menu |
|
From: Joe Z. <jz...@us...> - 2004-03-28 22:44:43
|
Update of /cvsroot/bobs/bobs/data In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv25059/bobs/data Modified Files: Makefile.in Log Message: Start cmdloop from /etc/init.d/cmdloopd instead of using check_loop in /etc/crontab. Index: Makefile.in =================================================================== RCS file: /cvsroot/bobs/bobs/data/Makefile.in,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- Makefile.in 8 May 2003 05:46:51 -0000 1.1 +++ Makefile.in 28 Mar 2004 22:33:22 -0000 1.2 @@ -76,14 +76,16 @@ install_sh = @install_sh@ myBOBSDATA = @myBOBSDATA@ myCRONDIR = @myCRONDIR@ -myCRONTABDIR = @myCRONTABDIR@ myHTTPDUSER = @myHTTPDUSER@ +myLOGDIR = @myLOGDIR@ myMANDIR = @myMANDIR@ myPASS = @myPASS@ +mySYSCONFDIR = @mySYSCONFDIR@ myWEBDIR = @myWEBDIR@ myrealBOBSDATA = @myrealBOBSDATA@ myrealCRONDIR = @myrealCRONDIR@ -myrealCRONTABDIR = @myrealCRONTABDIR@ +myrealLOGDIR = @myrealLOGDIR@ +myrealSYSCONFDIR = @myrealSYSCONFDIR@ myrealWEBDIR = @myrealWEBDIR@ dist_data_DATA = admin.pwd |
|
From: Joe Z. <jz...@us...> - 2004-03-28 22:44:42
|
Update of /cvsroot/bobs/bobs/doc In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv25059/bobs/doc Modified Files: Makefile.in Log Message: Start cmdloop from /etc/init.d/cmdloopd instead of using check_loop in /etc/crontab. Index: Makefile.in =================================================================== RCS file: /cvsroot/bobs/bobs/doc/Makefile.in,v retrieving revision 1.4 retrieving revision 1.5 diff -u -d -r1.4 -r1.5 --- Makefile.in 24 Apr 2003 06:15:57 -0000 1.4 +++ Makefile.in 28 Mar 2004 22:33:22 -0000 1.5 @@ -77,14 +77,16 @@ install_sh = @install_sh@ myBOBSDATA = @myBOBSDATA@ myCRONDIR = @myCRONDIR@ -myCRONTABDIR = @myCRONTABDIR@ myHTTPDUSER = @myHTTPDUSER@ +myLOGDIR = @myLOGDIR@ myMANDIR = @myMANDIR@ myPASS = @myPASS@ +mySYSCONFDIR = @mySYSCONFDIR@ myWEBDIR = @myWEBDIR@ myrealBOBSDATA = @myrealBOBSDATA@ myrealCRONDIR = @myrealCRONDIR@ -myrealCRONTABDIR = @myrealCRONTABDIR@ +myrealLOGDIR = @myrealLOGDIR@ +myrealSYSCONFDIR = @myrealSYSCONFDIR@ myrealWEBDIR = @myrealWEBDIR@ EXTRA_DIST = assign.php fileformat list.php |
|
From: Joe Z. <jz...@us...> - 2004-03-28 22:44:42
|
Update of /cvsroot/bobs/bobs/bash/init.d In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv25059/bobs/bash/init.d Added Files: Makefile.am Makefile.in cmdloopd.in Log Message: Start cmdloop from /etc/init.d/cmdloopd instead of using check_loop in /etc/crontab. --- NEW FILE: Makefile.am --- # install to to bobs script directory initdir = $(myrealSYSCONFDIR)/init.d dist_init_SCRIPTS = cmdloopd --- NEW FILE: Makefile.in --- # Makefile.in generated by automake 1.6.3 from Makefile.am. # @configure_input@ # Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002 # Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. # This program is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY, to the extent permitted by law; without # even the implied warranty of MERCHANTABILITY or FITNESS FOR A # PARTICULAR PURPOSE. @SET_MAKE@ # install to to bobs script directory SHELL = @SHELL@ srcdir = @srcdir@ top_srcdir = @top_srcdir@ VPATH = @srcdir@ prefix = @prefix@ exec_prefix = @exec_prefix@ bindir = @bindir@ sbindir = @sbindir@ libexecdir = @libexecdir@ datadir = @datadir@ sysconfdir = @sysconfdir@ sharedstatedir = @sharedstatedir@ localstatedir = @localstatedir@ libdir = @libdir@ infodir = @infodir@ mandir = @mandir@ includedir = @includedir@ oldincludedir = /usr/include pkgdatadir = $(datadir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ top_builddir = ../.. ACLOCAL = @ACLOCAL@ AUTOCONF = @AUTOCONF@ AUTOMAKE = @AUTOMAKE@ AUTOHEADER = @AUTOHEADER@ am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd INSTALL = @INSTALL@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_DATA = @INSTALL_DATA@ install_sh_DATA = $(install_sh) -c -m 644 install_sh_PROGRAM = $(install_sh) -c install_sh_SCRIPT = $(install_sh) -c INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_HEADER = $(INSTALL_DATA) transform = @program_transform_name@ NORMAL_INSTALL = : PRE_INSTALL = : POST_INSTALL = : NORMAL_UNINSTALL = : PRE_UNINSTALL = : POST_UNINSTALL = : EXEEXT = @EXEEXT@ OBJEXT = @OBJEXT@ PATH_SEPARATOR = @PATH_SEPARATOR@ AMTAR = @AMTAR@ AWK = @AWK@ DEPDIR = @DEPDIR@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ PACKAGE = @PACKAGE@ STRIP = @STRIP@ VERSION = @VERSION@ am__include = @am__include@ am__quote = @am__quote@ install_sh = @install_sh@ myBOBSDATA = @myBOBSDATA@ myCRONDIR = @myCRONDIR@ myHTTPDUSER = @myHTTPDUSER@ myLOGDIR = @myLOGDIR@ myMANDIR = @myMANDIR@ myPASS = @myPASS@ mySYSCONFDIR = @mySYSCONFDIR@ myWEBDIR = @myWEBDIR@ myrealBOBSDATA = @myrealBOBSDATA@ myrealCRONDIR = @myrealCRONDIR@ myrealLOGDIR = @myrealLOGDIR@ myrealSYSCONFDIR = @myrealSYSCONFDIR@ myrealWEBDIR = @myrealWEBDIR@ initdir = $(myrealSYSCONFDIR)/init.d dist_init_SCRIPTS = cmdloopd subdir = bash/init.d mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs CONFIG_CLEAN_FILES = cmdloopd SCRIPTS = $(dist_init_SCRIPTS) DIST_SOURCES = DIST_COMMON = $(dist_init_SCRIPTS) Makefile.am Makefile.in cmdloopd.in all: all-am .SUFFIXES: $(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) cd $(top_srcdir) && \ $(AUTOMAKE) --gnu bash/init.d/Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe) cmdloopd: $(top_builddir)/config.status cmdloopd.in cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ dist_initSCRIPT_INSTALL = $(INSTALL_SCRIPT) install-dist_initSCRIPTS: $(dist_init_SCRIPTS) @$(NORMAL_INSTALL) $(mkinstalldirs) $(DESTDIR)$(initdir) @list='$(dist_init_SCRIPTS)'; for p in $$list; do \ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ if test -f $$d$$p; then \ f=`echo "$$p" | sed 's|^.*/||;$(transform)'`; \ echo " $(dist_initSCRIPT_INSTALL) $$d$$p $(DESTDIR)$(initdir)/$$f"; \ $(dist_initSCRIPT_INSTALL) $$d$$p $(DESTDIR)$(initdir)/$$f; \ else :; fi; \ done uninstall-dist_initSCRIPTS: @$(NORMAL_UNINSTALL) @list='$(dist_init_SCRIPTS)'; for p in $$list; do \ f=`echo "$$p" | sed 's|^.*/||;$(transform)'`; \ echo " rm -f $(DESTDIR)$(initdir)/$$f"; \ rm -f $(DESTDIR)$(initdir)/$$f; \ done uninstall-info-am: tags: TAGS TAGS: DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) top_distdir = ../.. distdir = $(top_distdir)/$(PACKAGE)-$(VERSION) distdir: $(DISTFILES) @list='$(DISTFILES)'; for file in $$list; do \ if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ if test "$$dir" != "$$file" && test "$$dir" != "."; then \ dir="/$$dir"; \ $(mkinstalldirs) "$(distdir)$$dir"; \ else \ dir=''; \ fi; \ if test -d $$d/$$file; then \ if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ fi; \ cp -pR $$d/$$file $(distdir)$$dir || exit 1; \ else \ test -f $(distdir)/$$file \ || cp -p $$d/$$file $(distdir)/$$file \ || exit 1; \ fi; \ done check-am: all-am check: check-am all-am: Makefile $(SCRIPTS) installdirs: $(mkinstalldirs) $(DESTDIR)$(initdir) install: install-am install-exec: install-exec-am install-data: install-data-am uninstall: uninstall-am install-am: all-am @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am installcheck: installcheck-am install-strip: $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ INSTALL_STRIP_FLAG=-s \ `test -z '$(STRIP)' || \ echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install mostlyclean-generic: clean-generic: distclean-generic: -rm -f Makefile $(CONFIG_CLEAN_FILES) maintainer-clean-generic: @echo "This command is intended for maintainers to use" @echo "it deletes files that may require special tools to rebuild." clean: clean-am clean-am: clean-generic mostlyclean-am distclean: distclean-am distclean-am: clean-am distclean-generic dvi: dvi-am dvi-am: info: info-am info-am: install-data-am: install-dist_initSCRIPTS install-exec-am: install-info: install-info-am install-man: installcheck-am: maintainer-clean: maintainer-clean-am maintainer-clean-am: distclean-am maintainer-clean-generic mostlyclean: mostlyclean-am mostlyclean-am: mostlyclean-generic uninstall-am: uninstall-dist_initSCRIPTS uninstall-info-am .PHONY: all all-am check check-am clean clean-generic distclean \ distclean-generic distdir dvi dvi-am info info-am install \ install-am install-data install-data-am \ install-dist_initSCRIPTS install-exec install-exec-am \ install-info install-info-am install-man install-strip \ installcheck installcheck-am installdirs maintainer-clean \ maintainer-clean-generic mostlyclean mostlyclean-generic \ uninstall uninstall-am uninstall-dist_initSCRIPTS \ uninstall-info-am # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. .NOEXPORT: --- NEW FILE: cmdloopd.in --- #!/bin/sh # # cmdloopd This script starts and stops the bobs cmdloop process # # chkconfig: 2345 80 30 # # description: cmdloop is the bobs background "daemon" # processname: cmdloop # cmdloop directory CMDLOOP_DIR=@myrealBOBSDATA@/current/process LOGFILE=@myrealLOGDIR@/bobs.log # Does cmdloop script exist? [ -f ${CMDLOOP_DIR}/cmdloop ] || exit 1 # Start cmdloop case "$1" in start) # Do not start cmdloop if already running ps -C cmdloop &>/dev/null && echo "cmdloop is already running" && exit 0 # Start daemon. echo -n "Starting cmdloop: " ${CMDLOOP_DIR}/cmdloop >> $LOGFILE 2>&1 & RETVAL=$? if [ $RETVAL = 0 ];then echo 'OK' else echo 'FAILED' fi ;; stop) # Stop daemons. echo -n "Shutting down cmdloop: " killall -v cmdloop ;; restart) $0 stop $0 start ;; *) echo "Usage: $0 {start|stop}" exit 1 esac exit 0 # END |
|
From: Joe Z. <jz...@us...> - 2004-03-28 22:41:03
|
Update of /cvsroot/bobs/bobs/bash/init.d In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv24502/bash/init.d Log Message: Directory /cvsroot/bobs/bobs/bash/init.d added to the repository |
|
From: Joe Z. <jz...@us...> - 2004-03-26 21:44:51
|
Update of /cvsroot/bobs/bobs/inc In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv31807/bobs/inc Modified Files: class_db.php Log Message: Applied Rene's patch to allow db3 or db4. Index: class_db.php =================================================================== RCS file: /cvsroot/bobs/bobs/inc/class_db.php,v retrieving revision 1.4 retrieving revision 1.5 diff -u -d -r1.4 -r1.5 --- class_db.php 29 Sep 2002 06:08:01 -0000 1.4 +++ class_db.php 26 Mar 2004 21:33:50 -0000 1.5 @@ -18,6 +18,7 @@ var $db = ''; // holds an array of database pointers var $db_access = ''; // holds information about which type of db connection is open + var $db_type = ''; // the type of dba we use var $key = ''; var $value = ''; var $db_is_last_key = FALSE; // if this is TRUE then $this->key is the last in the db @@ -25,7 +26,6 @@ var $time; // this is a variable to hold information about performance - function database ($config) { // class constructor @@ -40,6 +40,22 @@ $this->session_id = $config["session_id"]; $this->filelinks = $config["filelinks"]; + // check what dba type we should use + $tmpfile = tempnam("/tmp", "BOBS"); + $dbcheck = @dba_open($tmpfile, "c", "db3"); + if ( $dbcheck === FALSE ) { + $dbcheck = @dba_open($tmpfile, "c", "db4"); + if ( $dbcheck === FALSE ) { + echo "Could not create a database of type db3 or db4 (tried both)\n"; + } else { + dba_close($dbcheck); + $this->db_type = "db4"; + } + } else { + dba_close($dbcheck); + $this->db_type = "db3"; + } + return; } @@ -58,12 +74,12 @@ if ( !isset($this->db[$where][$type]) ) { if ( file_exists ($db) ) { if ( is_writeable($db) ) { - $this->db[$where][$type] = dba_open($db, "w", "db3"); + $this->db[$where][$type] = dba_open($db, "w", $this->db_type); } else { - $this->db[$where][$type] = dba_open($db, "r", "db3"); + $this->db[$where][$type] = dba_open($db, "r", $this->db_type); } } else { - $this->db[$where][$type] = dba_open($db, "c", "db3"); + $this->db[$where][$type] = dba_open($db, "c", $this->db_type); } } return; @@ -167,7 +183,7 @@ // this function will clear a database. $db = $this->db_location($where, $type); - $this->db[$where][$type] = dba_open($db, "n", "db3"); + $this->db[$where][$type] = dba_open($db, "n", $this->db_type); return; } |
|
From: Joe Z. <jz...@us...> - 2004-03-26 21:44:51
|
Update of /cvsroot/bobs/bobs/inc/templates In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv31807/bobs/inc/templates Modified Files: backup_create_databases.php Log Message: Applied Rene's patch to allow db3 or db4. Index: backup_create_databases.php =================================================================== RCS file: /cvsroot/bobs/bobs/inc/templates/backup_create_databases.php,v retrieving revision 1.4 retrieving revision 1.5 diff -u -d -r1.4 -r1.5 --- backup_create_databases.php 15 Mar 2004 12:53:34 -0000 1.4 +++ backup_create_databases.php 26 Mar 2004 21:33:51 -0000 1.5 @@ -9,9 +9,18 @@ var $id = ''; // database handle function create ( $db ) { + + // check what dba type we should use $this->id = dba_open ($db, "n", "db3"); + if ( $this->id === FALSE ) { + $this->id = dba_open ($db, "n", "db4"); + if ( $this->id === FALSE ) { + echo "Could not create a database of type db3 or db4 (tried both)\n"; + } + } return; } + function closedb () { dba_sync($this->id); dba_close ($this->id); @@ -96,14 +105,20 @@ // open the file index db $id = dba_open($db, "r", "db3"); if (!$id) { - echo "dba_open failed\n"; - exit; + $id = dba_open($db, "r", "db4"); + if (!$id) { + echo "dba_open failed\n"; + exit; + } } // create a new dir database. $dir_id = dba_open ('{DIR_DB}', "n", "db3"); if (!$dir_id) { - echo "dba_open failed\n"; - exit; + $dir_id = dba_open ('{DIR_DB}', "n", "db4"); + if (!$dir_id) { + echo "dba_open failed\n"; + exit; + } } // set the first key |
|
From: Joe Z. <jz...@us...> - 2004-03-26 21:44:51
|
Update of /cvsroot/bobs/bobs In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv31807/bobs Modified Files: systemcheck.php Log Message: Applied Rene's patch to allow db3 or db4. Index: systemcheck.php =================================================================== RCS file: /cvsroot/bobs/bobs/systemcheck.php,v retrieving revision 1.6 retrieving revision 1.7 diff -u -d -r1.6 -r1.7 --- systemcheck.php 20 Jan 2004 04:14:47 -0000 1.6 +++ systemcheck.php 26 Mar 2004 21:33:51 -0000 1.7 @@ -292,20 +292,24 @@ putfail(); } -$t->assign ('ITEM', "Checking for db3 database support"); +$t->assign ('ITEM', "Checking for dba (db3 or db4) database support"); $tempfile = '/tmp/bobstest' . posix_getpid(); -$handle = dba_open("$tempfile", "c", "db3"); // open a temporary database +$handle = @dba_open("$tempfile", "c", "db3"); // open a temporary database +if (!$handle) { + $handle = @dba_open("$tempfile", "c", "db4"); // open a temporary database + if (!$handle) { + $t->assign ('STATUS', 'FAIL'); + $t->assign ('HELP', "dba database support is not working.<br> + You need to check your php configuration and<br> + include dba database support."); + putfail(); + } +} if ($handle) { dba_close($handle); // close it unlink($tempfile); // and delete it. $t->assign ('STATUS', 'PASS'); putpass(); -} else { - $t->assign ('STATUS', 'FAIL'); - $t->assign ('HELP', "db3 database support is not working.<br> - You need to check your php configuration and<br> - include db3 database support."); - putfail(); } // ---------------------------- |
|
From: Rene R. <ren...@us...> - 2004-03-15 13:02:40
|
Update of /cvsroot/bobs/bobs/inc/templates In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv26558 Modified Files: backup_create_databases.php Log Message: Fix an off by one error in getting file sizes. Reported by Hank Hampel Index: backup_create_databases.php =================================================================== RCS file: /cvsroot/bobs/bobs/inc/templates/backup_create_databases.php,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- backup_create_databases.php 4 Jan 2004 15:17:38 -0000 1.3 +++ backup_create_databases.php 15 Mar 2004 12:53:34 -0000 1.4 @@ -59,8 +59,8 @@ dba_insert ($num, $filedate, $this->id); } // insert filesize - // filesize in bytes is at position 8 - $filesize = $arrStat[8]; + // filesize in bytes is at position 7 + $filesize = $arrStat[7]; $num = $range+3; dba_insert ($num, $filesize, $this->id); //increment the range |
|
From: Joe Z. <jz...@us...> - 2004-02-07 23:25:28
|
Update of /cvsroot/bobs/bobs In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv894/bobs Modified Files: AUTHORS NEWS TODO VERSION bobs.spec configure configure.in Log Message: Release version 0.6.1. Index: AUTHORS =================================================================== RCS file: /cvsroot/bobs/bobs/AUTHORS,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- AUTHORS 1 Sep 2002 02:21:38 -0000 1.3 +++ AUTHORS 7 Feb 2004 23:22:30 -0000 1.4 @@ -27,3 +27,7 @@ Testing, bug fixes and documentation. Adapting the configuration stuff to use GNU auto{make,conf}. Rewrite administration interface. + + o Jochen Metzger <jme...@us...> + Contributed rsync over secure shell backup method. + Bug fixes. Index: NEWS =================================================================== RCS file: /cvsroot/bobs/bobs/NEWS,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- NEWS 4 Jan 2004 03:45:22 -0000 1.3 +++ NEWS 7 Feb 2004 23:22:30 -0000 1.4 @@ -22,3 +22,6 @@ 01-03-2004 Jochen Metzger joins bobs as a developer. Jochen created a patch to allow rsync over ssh as a backup method. + + 02-07-2004 + Released version 0.6.1. Index: TODO =================================================================== RCS file: /cvsroot/bobs/bobs/TODO,v retrieving revision 1.20 retrieving revision 1.21 diff -u -d -r1.20 -r1.21 --- TODO 20 Jan 2004 04:11:54 -0000 1.20 +++ TODO 7 Feb 2004 23:22:30 -0000 1.21 @@ -48,6 +48,7 @@ Priority: Medium A share name with a forward slash causes problems. Either don't allow invalid names, or escape them so they don't cause a problem. + Feb 2004: The '/' is now edited (not allowed). Send optional email indicating status of backup. Priority: High @@ -61,6 +62,7 @@ Write man/info pages Priority: Low + Minimal man page exists. --- End of Murray's Suggestions --- ----- WISHLIST ------ @@ -71,7 +73,7 @@ File locations should be defined in the individual servers config file(s) Offline file should also be allowed. (like tape backups) -Allow connect to bob web interface using https:// +Allow connect to bobs web interface using https:// This would allow a more secure interface for entering passwords into bobs gui. Index: VERSION =================================================================== RCS file: /cvsroot/bobs/bobs/VERSION,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- VERSION 4 May 2003 19:51:59 -0000 1.3 +++ VERSION 7 Feb 2004 23:22:30 -0000 1.4 @@ -1 +1 @@ -Version 0.6.0pre2 +Version 0.6.1 Index: bobs.spec =================================================================== RCS file: /cvsroot/bobs/bobs/bobs.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -d -r1.5 -r1.6 --- bobs.spec 22 Jun 2003 23:50:34 -0000 1.5 +++ bobs.spec 7 Feb 2004 23:22:30 -0000 1.6 @@ -1,6 +1,6 @@ Summary: Browseable Online Backup System (BOBS). Name: bobs -Version: 0.6.0 +Version: 0.6.1 Release: 1 License: GPL Group: Applications/Archiving @@ -73,7 +73,10 @@ /var/bobsdata %changelog +* Sat Feb 7 2004 Jochen Metzger <jme...@us...> +- Added backup method rsync over secure shell. * Sun Jun 22 2003 Joe Zacky <jz...@at...> - Release 0.6.0 * Tue Oct 15 2002 Rene Rask <re...@gr...> - Initial RPM release. + Index: configure =================================================================== RCS file: /cvsroot/bobs/bobs/configure,v retrieving revision 1.12 retrieving revision 1.13 diff -u -d -r1.12 -r1.13 --- configure 22 Jun 2003 23:50:34 -0000 1.12 +++ configure 7 Feb 2004 23:22:30 -0000 1.13 @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.57 for bobs 0.6.0. +# Generated by GNU Autoconf 2.57 for bobs 0.6.1. # # Copyright 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, 2002 # Free Software Foundation, Inc. @@ -266,8 +266,8 @@ # Identity of this package. PACKAGE_NAME='bobs' PACKAGE_TARNAME='bobs' -PACKAGE_VERSION='0.6.0' -PACKAGE_STRING='bobs 0.6.0' +PACKAGE_VERSION='0.6.1' +PACKAGE_STRING='bobs 0.6.1' PACKAGE_BUGREPORT='' ac_unique_file="admin.php" @@ -721,7 +721,7 @@ # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures bobs 0.6.0 to adapt to many kinds of systems. +\`configure' configures bobs 0.6.1 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -783,7 +783,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of bobs 0.6.0:";; + short | recursive ) echo "Configuration of bobs 0.6.1:";; esac cat <<\_ACEOF @@ -856,7 +856,7 @@ test -n "$ac_init_help" && exit 0 if $ac_init_version; then cat <<\_ACEOF -bobs configure 0.6.0 +bobs configure 0.6.1 generated by GNU Autoconf 2.57 Copyright 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, 2002 @@ -871,7 +871,7 @@ This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by bobs $as_me 0.6.0, which was +It was created by bobs $as_me 0.6.1, which was generated by GNU Autoconf 2.57. Invocation command line was $ $0 $@ @@ -1462,7 +1462,7 @@ # Define the identity of the package. PACKAGE=bobs - VERSION=0.6.0 + VERSION=0.6.1 cat >>confdefs.h <<_ACEOF @@ -2165,7 +2165,7 @@ } >&5 cat >&5 <<_CSEOF -This file was extended by bobs $as_me 0.6.0, which was +This file was extended by bobs $as_me 0.6.1, which was generated by GNU Autoconf 2.57. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -2220,7 +2220,7 @@ cat >>$CONFIG_STATUS <<_ACEOF ac_cs_version="\\ -bobs config.status 0.6.0 +bobs config.status 0.6.1 configured by $0, generated by GNU Autoconf 2.57, with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\" Index: configure.in =================================================================== RCS file: /cvsroot/bobs/bobs/configure.in,v retrieving revision 1.14 retrieving revision 1.15 diff -u -d -r1.14 -r1.15 --- configure.in 22 Jun 2003 23:50:34 -0000 1.14 +++ configure.in 7 Feb 2004 23:22:30 -0000 1.15 @@ -13,13 +13,13 @@ dnl> 02-03-2003 Provide destination for crontab for 'make rpm'. PACKAGE=bobs -VERSION=0.6.0 +VERSION=0.6.1 dnl> dnl> Verify we're in the right directory by looking for a unique file. dnl> -AC_INIT(bobs, 0.6.0) +AC_INIT(bobs, 0.6.1) AC_CONFIG_SRCDIR(admin.php) AM_INIT_AUTOMAKE |
|
From: Joe Z. <jz...@us...> - 2004-01-20 04:14:50
|
Update of /cvsroot/bobs/bobs
In directory sc8-pr-cvs1:/tmp/cvs-serv24810
Modified Files:
systemcheck.php
Log Message:
Don't create mount directories for rsync method.
Use ip address if specified.
Index: systemcheck.php
===================================================================
RCS file: /cvsroot/bobs/bobs/systemcheck.php,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- systemcheck.php 4 Jan 2004 03:45:22 -0000 1.5
+++ systemcheck.php 20 Jan 2004 04:14:47 -0000 1.6
@@ -401,9 +401,12 @@
// If backup has not been run on this server,
// the mount directory will not exist.
// Create it now so I can test if the mounts and stuff work.
+ // Don't need it if backup method is rsync or rcync_ssh so don't create it.
+ $config = $srvcfg->get_config();
+ $method = $config['backup_method'];
$mountdir=$srvcfg->get_mount_dir();
- if (! is_dir($mountdir)){
+ if (! is_dir($mountdir) && ($method != "rsync") && ($method != "rsync_ssh")){
$t->assign ('ITEM', "It appears $server/$share hasn't been backed up.<br>
I will attempt to create the mount directories needed to
continue these tests.");
@@ -517,8 +520,14 @@
// Test rsync over ssh
if ($method == "rsync_ssh"){
+ $server_ip = $config['server_ip'];
+ if ($server_ip != ''){
+ $server_or_ip = $server_ip;
+ } else {
+ $server_or_ip = $server;
+ }
$rsync_ssh_path = $config['rsync_ssh_path'];
- $rsync = "rsync -n -e ssh " . $server . ':' . $rsync_ssh_path;
+ $rsync = "rsync -n -e ssh " . $server_or_ip . ':' . $rsync_ssh_path;
$t->assign ('ITEM', "Testing rsync over ssh for backup method \"$method\" using this command:<br>
$rsync");
$srvtmpl->assign ('COMMAND', "$rsync"); // the mount command
|
|
From: Joe Z. <jz...@us...> - 2004-01-20 04:14:04
|
Update of /cvsroot/bobs/bobs/inc
In directory sc8-pr-cvs1:/tmp/cvs-serv24659/inc
Modified Files:
config.php.in gui.pinc
Log Message:
Separate option/text in drop down lists.
Index: config.php.in
===================================================================
RCS file: /cvsroot/bobs/bobs/inc/config.php.in,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- config.php.in 29 Dec 2003 02:43:28 -0000 1.9
+++ config.php.in 20 Jan 2004 04:14:01 -0000 1.10
@@ -49,7 +49,9 @@
$server_defs["backup_method"]["type"] = "list";
$server_defs["backup_method"]["desc"] = "Method for creating backups";
$server_defs["backup_method"]["list"]["0"] = "rsync";
+$server_defs["backup_method"]["list_text"]["0"] = "rsync using remote daemon";
$server_defs["backup_method"]["list"]["1"] = "rsync_ssh";
+$server_defs["backup_method"]["list_text"]["1"] = "rsync over ssh";
$server_defs["backup_method"]["list"]["2"] = "nfs";
$server_defs["backup_method"]["list"]["3"] = "smb";
Index: gui.pinc
===================================================================
RCS file: /cvsroot/bobs/bobs/inc/gui.pinc,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- gui.pinc 18 May 2003 06:37:41 -0000 1.3
+++ gui.pinc 20 Jan 2004 04:14:01 -0000 1.4
@@ -37,8 +37,13 @@
$html .= html_checkbox($name, $value, $io);
break;
case "list":
- foreach ($server_defs["$name"]["list"] as $option){
- $options[] .= $option;
+ foreach ($server_defs["$name"]["list"] as $option_key => $option){
+ $option_text = $server_defs["$name"]["list_text"]["$option_key"];
+ if ($option_text != ''){
+ $options["$option"] .= $option_text;
+ } else {
+ $options["$option"] .= $option;
+ }
}
$html .= html_list($name, $value, $io, $options);
break;
@@ -152,12 +157,12 @@
if ($io == 'i'){
$html .= "<select name=\"settings[$name]\">\n";
- foreach ($options as $option){
+ foreach ($options as $option => $option_text){
$html .= "<option value=\"$option\"";
if ($value == $option) {
$html .= " selected";
}
- $html .= ">$option\n";
+ $html .= ">$option_text\n";
}
$html .= "</select>\n";
} else {
|
|
From: Joe Z. <jz...@us...> - 2004-01-20 04:12:49
|
Update of /cvsroot/bobs/bobs/inc
In directory sc8-pr-cvs1:/tmp/cvs-serv24524/inc
Modified Files:
class_admin.php
Log Message:
Minor bug fix in fgets() reported by M. Jackson.
Index: class_admin.php
===================================================================
RCS file: /cvsroot/bobs/bobs/inc/class_admin.php,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- class_admin.php 8 May 2003 05:46:51 -0000 1.4
+++ class_admin.php 20 Jan 2004 04:12:46 -0000 1.5
@@ -21,7 +21,7 @@
if(! ($fp = fopen ($pwdfile, "r"))){ // Open it for writing.
return("Error opening $pwdfile"); // Aawww, couldn't open it.
}
- $this->admin_pwd = rtrim(fgets($fp)); // Store pwd in class data
+ $this->admin_pwd = rtrim(fgets($fp,filesize($pwdfile) + 1)); // Store pwd in class data
fclose($fp);
}
|
|
From: Joe Z. <jz...@us...> - 2004-01-20 04:11:57
|
Update of /cvsroot/bobs/bobs In directory sc8-pr-cvs1:/tmp/cvs-serv24320 Modified Files: TODO Log Message: Add a couple of Jochen Metzger's suggestions. Index: TODO =================================================================== RCS file: /cvsroot/bobs/bobs/TODO,v retrieving revision 1.19 retrieving revision 1.20 diff -u -d -r1.19 -r1.20 --- TODO 19 May 2003 00:11:39 -0000 1.19 +++ TODO 20 Jan 2004 04:11:54 -0000 1.20 @@ -70,3 +70,10 @@ More flexible file locations. File locations should be defined in the individual servers config file(s) Offline file should also be allowed. (like tape backups) + +Allow connect to bob web interface using https:// + This would allow a more secure interface for entering passwords + into bobs gui. + +Multilingual support. + Perhaps implement with .ini files and language class. |
|
From: Jochen M. <jme...@us...> - 2004-01-04 21:10:52
|
Update of /cvsroot/bobs/bobs/inc
In directory sc8-pr-cvs1:/tmp/cvs-serv19764
Modified Files:
class_server.php
Log Message:
fixed login bug (2 users with identical loginnames) could get access to eachothers shares
Index: class_server.php
===================================================================
RCS file: /cvsroot/bobs/bobs/inc/class_server.php,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- class_server.php 29 Dec 2003 02:43:28 -0000 1.7
+++ class_server.php 4 Jan 2004 21:10:49 -0000 1.8
@@ -32,7 +32,8 @@
foreach ( $this->servers as $server ) {
$cur_server = $server["server"] . '.' . $server["share"];
if ( $cur_server == $login_server && $server["password"] == $login_password
- && $server["restore_method"] != "none") { // not allowed to login, when restore_method == "none"
+ && $server["login"] == $login_name // be sure it is the same user
+ && $server["restore_method"] != "none") { // not allowed to login, when restore_method == "none"
$this->login_ok = 'yes';
$this->config = $server;
return;
|
|
From: Jochen M. <jme...@us...> - 2004-01-04 15:17:42
|
Update of /cvsroot/bobs/bobs/inc/templates
In directory sc8-pr-cvs1:/tmp/cvs-serv18968
Modified Files:
backup_create_databases.php
Log Message:
fixed bug with stats. Did not stat properly on symbolic links
Index: backup_create_databases.php
===================================================================
RCS file: /cvsroot/bobs/bobs/inc/templates/backup_create_databases.php,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- backup_create_databases.php 8 Jan 2003 15:55:50 -0000 1.2
+++ backup_create_databases.php 4 Jan 2004 15:17:38 -0000 1.3
@@ -45,15 +45,22 @@
// insert name
$num = $range+1;
dba_insert ($num, $file['name'], $this->id);
+
+ // changed to let it also work for symbolic links
+ $arrStat = lstat($file['dir'] . '/' . $file['name']);
+
// insert date if it is not part of the filename (it is in incremental files)
if ( $date == "current" ) {
$num = $range+2;
- $stamp = filemtime ($file['dir'] . '/' . $file['name']);
+ // date of last modification is at position 10
+ $stamp = $arrStat[10];
+
$filedate = sprintf(".%04d.%03d", date("Y", $stamp), date("z", $stamp));
dba_insert ($num, $filedate, $this->id);
}
// insert filesize
- $filesize = filesize($file['dir'] . '/' . $file['name']);
+ // filesize in bytes is at position 8
+ $filesize = $arrStat[8];
$num = $range+3;
dba_insert ($num, $filesize, $this->id);
//increment the range
|
