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...> - 2003-05-08 05:46:55
|
Update of /cvsroot/bobs/bobs/data
In directory sc8-pr-cvs1:/tmp/cvs-serv5001/bobs/data
Added Files:
Makefile.am Makefile.in admin.pwd.in
Log Message:
The admin password is now encrypted. There is a link at the bottom of the
'servers' page to change the admin password.
--- NEW FILE: Makefile.am ---
datadir = $(myBOBSDATA)
dist_data_DATA = admin.pwd
--- 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@
SHELL = @SHELL@
srcdir = @srcdir@
top_srcdir = @top_srcdir@
VPATH = @srcdir@
prefix = @prefix@
exec_prefix = @exec_prefix@
bindir = @bindir@
sbindir = @sbindir@
libexecdir = @libexecdir@
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@
datadir = $(myBOBSDATA)
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@
myCRONTABDIR = @myCRONTABDIR@
myHTTPDUSER = @myHTTPDUSER@
myMANDIR = @myMANDIR@
myPASS = @myPASS@
myWEBDIR = @myWEBDIR@
myrealBOBSDATA = @myrealBOBSDATA@
myrealCRONDIR = @myrealCRONDIR@
myrealCRONTABDIR = @myrealCRONTABDIR@
myrealWEBDIR = @myrealWEBDIR@
dist_data_DATA = admin.pwd
subdir = data
mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
CONFIG_CLEAN_FILES = admin.pwd
DIST_SOURCES =
DATA = $(dist_data_DATA)
DIST_COMMON = $(dist_data_DATA) Makefile.am Makefile.in admin.pwd.in
all: all-am
.SUFFIXES:
$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4)
cd $(top_srcdir) && \
$(AUTOMAKE) --gnu data/Makefile
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)
admin.pwd: $(top_builddir)/config.status admin.pwd.in
cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
uninstall-info-am:
dist_dataDATA_INSTALL = $(INSTALL_DATA)
install-dist_dataDATA: $(dist_data_DATA)
@$(NORMAL_INSTALL)
$(mkinstalldirs) $(DESTDIR)$(datadir)
@list='$(dist_data_DATA)'; for p in $$list; do \
if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
f="`echo $$p | sed -e 's|^.*/||'`"; \
echo " $(dist_dataDATA_INSTALL) $$d$$p $(DESTDIR)$(datadir)/$$f"; \
$(dist_dataDATA_INSTALL) $$d$$p $(DESTDIR)$(datadir)/$$f; \
done
uninstall-dist_dataDATA:
@$(NORMAL_UNINSTALL)
@list='$(dist_data_DATA)'; for p in $$list; do \
f="`echo $$p | sed -e 's|^.*/||'`"; \
echo " rm -f $(DESTDIR)$(datadir)/$$f"; \
rm -f $(DESTDIR)$(datadir)/$$f; \
done
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 $(DATA)
installdirs:
$(mkinstalldirs) $(DESTDIR)$(datadir)
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_dataDATA
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_dataDATA 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_dataDATA \
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_dataDATA 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: admin.pwd.in ---
@myPASS@
|
|
From: Joe Z. <jz...@us...> - 2003-05-08 05:46:55
|
Update of /cvsroot/bobs/bobs/inc
In directory sc8-pr-cvs1:/tmp/cvs-serv5001/bobs/inc
Modified Files:
class_admin.php class_config.php class_server.php
config.php.in
Log Message:
The admin password is now encrypted. There is a link at the bottom of the
'servers' page to change the admin password.
Index: class_admin.php
===================================================================
RCS file: /cvsroot/bobs/bobs/inc/class_admin.php,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- class_admin.php 1 Sep 2002 02:24:01 -0000 1.3
+++ class_admin.php 8 May 2003 05:46:51 -0000 1.4
@@ -5,22 +5,82 @@
class admin extends config {
+ var $admin_pwd; // Administrator password
var $admin_ok = 'no'; // no admin login accepted yet
// ---------------------------------------------------------
+// config - class constructor
+// ---------------------------------------------------------
+function admin () {
+
+ parent::config(); // Execute config class constructor
+
+ // Get and store admin password
+
+ $pwdfile = ($this->get_datadir()) . '/admin.pwd'; // And the password file name is
+ 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
+ fclose($fp);
+}
+
+// ---------------------------------------------------------
// check_admin
// Used by: admin.php
// ---------------------------------------------------------
function check_admin ($password) {
if ( $this->admin_ok != "yes" ) {
- if ( $this->admin_pwd == $password ) {
+ if (crypt("$password", "$this->admin_pwd") == "$this->admin_pwd"){
$this->admin_ok = "yes";
}
}
return $this->admin_ok;
}
-} // class end bracket
+// ---------------------------------------------------------------------------
+// chg_pwd
+// Desc: Encrypts and stores password in config.php
+// Parms: Current unencrypted password
+// Unencrypted password
+// and again
+// Returns: string - message if error, otherwise null string (false)
+// Used by: chgadminpwd.php
+// ---------------------------------------------------------------------------
+function chg_pwd ($curpass, $pass1, $pass2) {
+
+ // Verify the current password is correct
+
+ if (crypt("$curpass", "$this->admin_pwd") != "$this->admin_pwd"){
+ return("Current password is not correct.");
+ }
+
+ // Verify pass1 and pass2 are equal
+
+ if ($pass1 != $pass2){
+ return("New passwords don't match.");
+ }
+
+ // Encrypt the password
+
+ $crypt_pass = crypt($pass1);
+
+ // Store it in the database
+
+ $pwdfile = ($this->get_datadir()) . '/admin.pwd'; // And the password file name is
+ if(! ($fp = fopen ($pwdfile, "w"))){ // Open it for writing.
+ return("Error opening $pwdfile"); // Aawww, couldn't open it.
+ }
+ fwrite($fp, $crypt_pass); // Write the crypted password to it.
+ fclose($fp);
+ // and store it in the current session
+
+ $this->admin_pwd = $crypt_pass;
+
+ return ""; // No error if we got here
+}
+
+} // class end bracket
?>
Index: class_config.php
===================================================================
RCS file: /cvsroot/bobs/bobs/inc/class_config.php,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -d -r1.13 -r1.14
--- class_config.php 24 Apr 2003 06:15:59 -0000 1.13
+++ class_config.php 8 May 2003 05:46:51 -0000 1.14
@@ -5,7 +5,6 @@
class config {
- var $admin_pwd; // Administrator password
var $sys_conf; // Configuration settings
var $server_defs; // Server field definitions
var $serverdir = ''; // location of server configs
@@ -20,7 +19,6 @@
// Store configuration data from config.php
- $this->admin_pwd = $admin_pwd;
$this->sys_conf = $sys_conf;
$this->server_defs = $server_defs;
Index: class_server.php
===================================================================
RCS file: /cvsroot/bobs/bobs/inc/class_server.php,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- class_server.php 26 Apr 2003 22:39:43 -0000 1.3
+++ class_server.php 8 May 2003 05:46:51 -0000 1.4
@@ -226,7 +226,8 @@
break;
case 'smb': $mntcmd = 'smbmount "//' . $server_handle . '/' . $this->config['smb_share'] .
'" "' . $mountdir . '" -o username=' .
- $this->config['login'] . ',password=' . $this->config['password'];
+ $this->config['login'] . ',password=' . $this->config['password'] .
+ ' &>/dev/null';
break;
case 'nfs': $mntcmd = 'mount -t nfs ' . '"' . $server_handle . ':' .
$this->config['nfs_share'] . '" "' . $mountdir . '"';
Index: config.php.in
===================================================================
RCS file: /cvsroot/bobs/bobs/inc/config.php.in,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- config.php.in 24 Apr 2003 06:15:59 -0000 1.6
+++ config.php.in 8 May 2003 05:46:51 -0000 1.7
@@ -1,9 +1,6 @@
<?php
// @configure_input@
-// master password
-$admin_pwd = '@myPASS@';
-
// define locations of various files
// Base data directory
|
|
From: Joe Z. <jz...@us...> - 2003-05-08 05:46:55
|
Update of /cvsroot/bobs/bobs
In directory sc8-pr-cvs1:/tmp/cvs-serv5001/bobs
Modified Files:
INSTALL Makefile.am Makefile.in admin.php configure
configure.in
Added Files:
BUGS chgadminpwd.php
Log Message:
The admin password is now encrypted. There is a link at the bottom of the
'servers' page to change the admin password.
--- NEW FILE: BUGS ---
BOBS BUGS
Remove these items as their fixed and put a not in ChangeLog.
- Reported by Joe Zacky 05-04-2003
systemcheck.php reports "I didn't find any backup files" if the httpd user
id doesn't have access to the directory being backed up. That means if you
backup a directory that has permissions of 700, for example, then
systemcheck.php won't be able to read it. One solution would be to have
cmdloop read the directory and report back to systemcheck.php.
--- NEW FILE: chgadminpwd.php ---
<?php
// ------------------------------------------------
// Change admin password screen
// ------------------------------------------------
require_once ('inc/class_rfasttemplate.php'); // Template class
require_once("inc/class_config.php"); // Site configuration class
require_once('inc/class_admin.php'); // Admin functions
// Setup the session
session_start();
if(!session_is_registered("admin")) { // Not logged to admin
redirect(); // Redirect to admin login page
}
$admin = &$_SESSION['admin']; // $admin contains the admin class vars
// Am I logged in to the admin session?
if ($admin->admin_ok != "yes"){ // Apparently not.
redirect(); // Redirect to admin login page
}
// Define the page template
$t = new rFastTemplate('inc/templates'); // Instantiate new template
$t->define(array('chgpwd' => 'chgadminpwd.thtml')); // Tell rfasttemplate the template file name
$t->assign('PHPSELF', $_SERVER['PHP_SELF']); // Replace PHPSELF with the current URL
$t->assign('ERRMSG', " ");
// What action to take?
if (isset($_POST['chg_pwd_OK'])){ // OK button pressed on chg pwd screen
$errmsg = change_pwd(); // Change the password
$t->assign('ERRMSG', $errmsg); // Put error msg to template
}
// Output the html
include_once("inc/header.pinc"); // This is the menu bar and main title.
$t->parse('CHGPWD', 'chgpwd'); // Parse the template.
$t->FastPrint(); // and send it to stdout.
return; // The End
// ================================================
// change_pwd - Invoke class function to change admin password
// Parms: None
// Returns: string - Error message, or null if success
// ================================================
function change_pwd() {
global $admin;
$errmsg = $admin->chg_pwd($_POST['curpwd'],
$_POST['newpwd'], $_POST['newpwd2']);
if (! $errmsg){ // No errors.
$errmsg = "Password successfully changed.";
}
return $errmsg;
}
// ================================================
// redirect - Redirect Browser to admin login page
// Parms: None
// Returns: Nothing
// ================================================
function redirect() {
$bobsdir = dirname($_SERVER['PHP_SELF']); // Get web page directory
$adminpage = $bobsdir . '/admin.php'; // Point to admin page
header("Location: $adminpage"); // Redirect browser to BOBS admin page
exit; // Make sure that code below does not get executed
}
?>
Index: INSTALL
===================================================================
RCS file: /cvsroot/bobs/bobs/INSTALL,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -d -r1.21 -r1.22
--- INSTALL 4 May 2003 19:51:59 -0000 1.21
+++ INSTALL 8 May 2003 05:46:50 -0000 1.22
@@ -290,12 +290,6 @@
This will install the web pages, create the backup data
directories, and add a cron job to /etc/crontab.
- FIXME:
- You should now change the bobs admin password. The password
- defaults to 'admin'. Open the file config.php and change the
- value of the admin_pwd variable. By default, config.php will be in
- /var/www/html/bobs/inc/config.php.
-
4. Bobs is now installed.
Point your browser to http://your.server.name/bobs/admin.php.
@@ -379,3 +373,7 @@
remove all the files and directories, including any backups. So only
run 'make uninstall-all' if you want to completely remove bobs and all
configurations and backups created by bobs.
+
+CAUTION: If any "bobs" backup directories are mounted (they're in
+/var/bobsdata), 'make uninstall-all' will delete the mounted directory! I
+think I deleted all my kid's homework by accident that way.
Index: Makefile.am
===================================================================
RCS file: /cvsroot/bobs/bobs/Makefile.am,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -d -r1.13 -r1.14
--- Makefile.am 26 Apr 2003 22:39:43 -0000 1.13
+++ Makefile.am 8 May 2003 05:46:51 -0000 1.14
@@ -20,7 +20,7 @@
# Subdirectories to also be built
# Each subdirectory has it's own Makefile.am
-SUBDIRS = bash doc cron images inc js winc man
+SUBDIRS = bash data doc cron images inc js man winc
# Install html documents.
# By using a variable htmldir, ending in 'dir'
Index: Makefile.in
===================================================================
RCS file: /cvsroot/bobs/bobs/Makefile.in,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -d -r1.11 -r1.12
--- Makefile.in 26 Apr 2003 22:39:43 -0000 1.11
+++ Makefile.in 8 May 2003 05:46:51 -0000 1.12
@@ -92,7 +92,7 @@
myrealCRONTABDIR = @myrealCRONTABDIR@
myrealWEBDIR = @myrealWEBDIR@
-SUBDIRS = bash doc cron images inc js winc man
+SUBDIRS = bash data doc cron images inc js man winc
# Install html documents.
@@ -299,7 +299,7 @@
distdir: $(DISTFILES)
$(am__remove_distdir)
mkdir $(distdir)
- $(mkinstalldirs) $(distdir)/cron $(distdir)/inc
+ $(mkinstalldirs) $(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,/[^/]*$$,,'`; \
Index: admin.php
===================================================================
RCS file: /cvsroot/bobs/bobs/admin.php,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -d -r1.19 -r1.20
--- admin.php 26 Apr 2003 22:39:43 -0000 1.19
+++ admin.php 8 May 2003 05:46:51 -0000 1.20
@@ -226,6 +226,10 @@
$html = $serverlist->gethtml($PHP_SELF); // Generate the html
echo "<center>$html</center>"; // Output the html
+
+ // Link to change admin password
+
+ echo "<a href=\"chgadminpwd.php\">Change Admin Password</a>\n";
}
// ----------------------------------------------------------------
Index: configure
===================================================================
RCS file: /cvsroot/bobs/bobs/configure,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- configure 4 May 2003 19:51:59 -0000 1.10
+++ configure 8 May 2003 05:46:51 -0000 1.11
@@ -1725,7 +1725,7 @@
fi
-myPASS=admin
+myPASS=$(echo '<?php echo crypt("admin"); ?>' | php | tail -n 1)
myCRONTABDIR=${sysconfdir}
@@ -1745,7 +1745,7 @@
- ac_config_files="$ac_config_files Makefile bash/Makefile cron/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 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"
@@ -1773,7 +1773,7 @@
)`
- ac_config_files="$ac_config_files inc/config.php cron/backup.php cron/check_loop"
+ ac_config_files="$ac_config_files inc/config.php data/admin.pwd cron/backup.php cron/check_loop"
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
@@ -2327,6 +2327,7 @@
"Makefile" ) CONFIG_FILES="$CONFIG_FILES Makefile" ;;
"bash/Makefile" ) CONFIG_FILES="$CONFIG_FILES bash/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" ;;
"images/Makefile" ) CONFIG_FILES="$CONFIG_FILES images/Makefile" ;;
"images/bar/Makefile" ) CONFIG_FILES="$CONFIG_FILES images/bar/Makefile" ;;
@@ -2339,6 +2340,7 @@
"man/Makefile" ) CONFIG_FILES="$CONFIG_FILES man/Makefile" ;;
"winc/Makefile" ) CONFIG_FILES="$CONFIG_FILES winc/Makefile" ;;
"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" ;;
*) { { echo "$as_me:$LINENO: error: invalid argument: $ac_config_target" >&5
@@ -2698,7 +2700,7 @@
echo -n " bobs data directory = "; eval echo $myBOBSDATA
echo -n " cron directory = "; eval echo $myCRONDIR
echo -n " crontab directory = "; eval echo $myCRONTABDIR
-echo " admin password = $myPASS"
+echo " admin password = admin"
echo ""
echo "*** $WARNCOUNT warning(s)"
echo ""
Index: configure.in
===================================================================
RCS file: /cvsroot/bobs/bobs/configure.in,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -d -r1.12 -r1.13
--- configure.in 4 May 2003 19:51:59 -0000 1.12
+++ configure.in 8 May 2003 05:46:51 -0000 1.13
@@ -90,7 +90,7 @@
dnl> Setup a bobs administrator password.
dnl>
-myPASS=admin
+myPASS=$(echo '<?php echo crypt("admin"); ?>' | php | tail -n 1)
dnl>
dnl> Location of crontab file
@@ -127,6 +127,7 @@
Makefile
bash/Makefile
cron/Makefile
+data/Makefile
doc/Makefile
images/Makefile
images/bar/Makefile
@@ -170,6 +171,7 @@
AC_OUTPUT([
inc/config.php
+data/admin.pwd
cron/backup.php
cron/check_loop
])
@@ -185,7 +187,7 @@
echo -n " bobs data directory = "; eval echo $myBOBSDATA
echo -n " cron directory = "; eval echo $myCRONDIR
echo -n " crontab directory = "; eval echo $myCRONTABDIR
-echo " admin password = $myPASS"
+echo " admin password = admin"
echo ""
echo "*** $WARNCOUNT warning(s)"
echo ""
|
|
From: Joe Z. <jz...@us...> - 2003-05-08 05:46:55
|
Update of /cvsroot/bobs/bobs/inc/templates
In directory sc8-pr-cvs1:/tmp/cvs-serv5001/bobs/inc/templates
Added Files:
chgadminpwd.thtml
Log Message:
The admin password is now encrypted. There is a link at the bottom of the
'servers' page to change the admin password.
--- NEW FILE: chgadminpwd.thtml ---
<!-- rfasttemplate: Change Admin Password -->
<center><h2> Change Administrator Password </h2></center>
<div class="instruction">Type the current and new password and click OK.</div>
<div class="errmsg">{ERRMSG}</div>
<form action="{PHPSELF}" method="post">
<table align="center" border="0" >
<tbody>
<tr>
<td align="right"><p>Current bobs administrator password: </td>
<td align="left"><input type="password" name="curpwd"></td>
<tr>
<td align="right"><p>new password: </td>
<td align="left"><input type="password" name="newpwd"></td>
<tr>
<td align="right"><p>new password (again): </td>
<td align="left"><input type="password" name="newpwd2"></td>
<!-- pressing Enter will not set "chg_pwd_OK", but this will-->
<td align="left"><input type="hidden" name="chg_pwd_OK" value="OK"></td>
</tr>
<tr>
<td align="center" colspan="2">
<br><input type="submit" name="chg_pwd_OK" value="Change Password"></td>
</tr>
</tbody>
</table>
</form>
</body>
</html>
|
|
From: Joe Z. <jz...@us...> - 2003-05-08 05:44:35
|
Update of /cvsroot/bobs/bobs/data In directory sc8-pr-cvs1:/tmp/cvs-serv4637/data Log Message: Directory /cvsroot/bobs/bobs/data added to the repository |
|
From: Joe Z. <jz...@us...> - 2003-05-04 19:52:06
|
Update of /cvsroot/bobs/bobs In directory sc8-pr-cvs1:/tmp/cvs-serv3590/bobs Modified Files: ChangeLog INSTALL NEWS VERSION bobs.spec configure configure.in Log Message: Prepare for release 0.6.0pre2 Index: ChangeLog =================================================================== RCS file: /cvsroot/bobs/bobs/ChangeLog,v retrieving revision 1.8 retrieving revision 1.9 diff -u -d -r1.8 -r1.9 --- ChangeLog 1 May 2003 05:21:14 -0000 1.8 +++ ChangeLog 4 May 2003 19:51:59 -0000 1.9 @@ -3,6 +3,7 @@ Version ? (edit as you go) +Version 0.6.0pre2 Rene Rask (re...@gr...) -- Bug fix 4-02-2003 When backing up multiple servers using nfs, one of the nfs Index: INSTALL =================================================================== RCS file: /cvsroot/bobs/bobs/INSTALL,v retrieving revision 1.20 retrieving revision 1.21 diff -u -d -r1.20 -r1.21 --- INSTALL 28 Mar 2003 03:38:22 -0000 1.20 +++ INSTALL 4 May 2003 19:51:59 -0000 1.21 @@ -298,10 +298,19 @@ 4. Bobs is now installed. - Point your browser to http://your.server.name/bobs/admin.php to - configure your backups. + Point your browser to http://your.server.name/bobs/admin.php. -5. If you want to uninstall bobs, or change your configuration: + Log in. The default password is 'admin'. + + Click on 'Check Configuration'. This will tell you if bobs + is running properly. + +5. Now you can create backup configurations. After you create one, + highlight the new configuration in the list and click on + 'Check Configuration'. This will run lots of diagnostics and + tell you if your backup configuration is okay. + +6. If you want to uninstall bobs, or change your configuration: Run 'make uninstall' from the directory where you extracted the bobs files to remove the bobs web pages and delete the Index: NEWS =================================================================== RCS file: /cvsroot/bobs/bobs/NEWS,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- NEWS 10 Jun 2002 05:03:20 -0000 1.1 +++ NEWS 4 May 2003 19:51:59 -0000 1.2 @@ -12,3 +12,6 @@ ==== Adapting to the GNU auto{make,conf} stuff + + 05-04-2003 + Released version 0.6.0pre2. Index: VERSION =================================================================== RCS file: /cvsroot/bobs/bobs/VERSION,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- VERSION 28 Mar 2003 03:38:22 -0000 1.2 +++ VERSION 4 May 2003 19:51:59 -0000 1.3 @@ -1 +1 @@ -Version 0.6.0pre1 +Version 0.6.0pre2 Index: bobs.spec =================================================================== RCS file: /cvsroot/bobs/bobs/bobs.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- bobs.spec 20 Apr 2003 08:02:51 -0000 1.3 +++ bobs.spec 4 May 2003 19:51:59 -0000 1.4 @@ -1,6 +1,6 @@ Summary: Browseable Online Backup System (BOBS). Name: bobs -Version: 0.6.0pre1 +Version: 0.6.0pre2 Release: 1 License: GPL Group: Applications/Archiving Index: configure =================================================================== RCS file: /cvsroot/bobs/bobs/configure,v retrieving revision 1.9 retrieving revision 1.10 diff -u -d -r1.9 -r1.10 --- configure 24 Apr 2003 06:15:56 -0000 1.9 +++ configure 4 May 2003 19:51:59 -0000 1.10 @@ -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.0pre1. +# Generated by GNU Autoconf 2.57 for bobs 0.6.0pre2. # # 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.0pre1' -PACKAGE_STRING='bobs 0.6.0pre1' +PACKAGE_VERSION='0.6.0pre2' +PACKAGE_STRING='bobs 0.6.0pre2' 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.0pre1 to adapt to many kinds of systems. +\`configure' configures bobs 0.6.0pre2 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.0pre1:";; + short | recursive ) echo "Configuration of bobs 0.6.0pre2:";; 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.0pre1 +bobs configure 0.6.0pre2 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.0pre1, which was +It was created by bobs $as_me 0.6.0pre2, 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.0pre1 + VERSION=0.6.0pre2 cat >>confdefs.h <<_ACEOF @@ -2165,7 +2165,7 @@ } >&5 cat >&5 <<_CSEOF -This file was extended by bobs $as_me 0.6.0pre1, which was +This file was extended by bobs $as_me 0.6.0pre2, 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.0pre1 +bobs config.status 0.6.0pre2 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.11 retrieving revision 1.12 diff -u -d -r1.11 -r1.12 --- configure.in 24 Apr 2003 06:15:56 -0000 1.11 +++ configure.in 4 May 2003 19:51:59 -0000 1.12 @@ -13,13 +13,13 @@ dnl> 02-03-2003 Provide destination for crontab for 'make rpm'. PACKAGE=bobs -VERSION=0.6.0pre1 +VERSION=0.6.0pre2 dnl> dnl> Verify we're in the right directory by looking for a unique file. dnl> -AC_INIT(bobs, 0.6.0pre1) +AC_INIT(bobs, 0.6.0pre2) AC_CONFIG_SRCDIR(admin.php) AM_INIT_AUTOMAKE |
|
From: Joe Z. <jz...@us...> - 2003-05-01 05:21:18
|
Update of /cvsroot/bobs/bobs
In directory sc8-pr-cvs1:/tmp/cvs-serv27119/bobs
Modified Files:
ChangeLog TODO lookadmin.css systemcheck.php
Log Message:
Fixup systemcheck.php:
Create mount directories if they don't exist.
Test rsync.
Index: ChangeLog
===================================================================
RCS file: /cvsroot/bobs/bobs/ChangeLog,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- ChangeLog 20 Apr 2003 08:02:51 -0000 1.7
+++ ChangeLog 1 May 2003 05:21:14 -0000 1.8
@@ -8,6 +8,13 @@
When backing up multiple servers using nfs, one of the nfs
shares stays mounted.
+ Joe Zacky ( jz...@us... )
+ -- 4-18-2003
+ Wrote a minimal man page: 'man bobs'.
+ -- 4-26-2003
+ Create a "Check Configuration" option on the admin page.
+ Admins need to be able to test if a setup works.
+
Version 0.6.0pre1
Rene Rask (re...@gr...)
-- Generating dir trees on backup.
Index: TODO
===================================================================
RCS file: /cvsroot/bobs/bobs/TODO,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -d -r1.15 -r1.16
--- TODO 26 Apr 2003 22:39:43 -0000 1.15
+++ TODO 1 May 2003 05:21:14 -0000 1.16
@@ -26,10 +26,6 @@
Priority: Medium
It's currently hardcoded, but should be easy to move.
-Create a "test server" option on the admin pages.
- Priority: Medium
- Admins need to be able to test if a setup works.
-
Add security.
Priority: Medium
Backup directories (/var/bobsdata/) should not be world readable.
@@ -65,6 +61,12 @@
Write man/info pages
Priority: Low
+
+Add "Backup Now" button under "Check Configuration" button.
+ Priority: Medium
+ This will add the final touch to testing the server setup
+ and allow people to run backups on demand.
+ Use interprocess communication like systemcheck.php does.
--- End of Murray's Suggestions ---
----- WISHLIST ------
Index: lookadmin.css
===================================================================
RCS file: /cvsroot/bobs/bobs/lookadmin.css,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- lookadmin.css 26 Apr 2003 22:39:43 -0000 1.1
+++ lookadmin.css 1 May 2003 05:21:14 -0000 1.2
@@ -1,12 +1,14 @@
body { color: black; font-style: normal; font-size: 14px; font-family: Verdana, Helvetica, Arial }
td { color: #000000; font-size: 14px; font-family: Verdana, Helvetica, Arial }
tr { color: #000000; font-size: 14px; font-family: Verdana, Helvetica, Arial }
-a:link { color: #000000; text-decoration: none; font-size: 14px; font-family: Verdana, Helvetica, Arial } }
-a:visited { color: #000000; text-decoration: none; font-size: 14px; font-family: Verdana, Helvetica, Arial } }
-a:hover { color: #000000; text-decoration: underline; font-size: 14px; font-family: Verdana, Helvetica, Arial } }
-a:active { color: #000000; text-decoration: none; font-size: 14px; font-family: Verdana, Helvetica, Arial } }
+a:link { color: #000000; text-decoration: none; font-size: 14px; font-family: Verdana, Helvetica, Arial }
+a:visited { color: #000000; text-decoration: none; font-size: 14px; font-family: Verdana, Helvetica, Arial }
+a:hover { color: #000000; text-decoration: underline; font-size: 14px; font-family: Verdana, Helvetica, Arial }
+a:active { color: #000000; text-decoration: none; font-size: 14px; font-family: Verdana, Helvetica, Arial }
img { border-width: 0px }
img { border: 0px }
-div.instruction {text-align: left; font-size: 14px;}
-div.serverhead {text-align: center; font-size: 14px;}
-div.servermode {text-align: right; font-size: 14px;}
+div.instruction { text-align: left; font-size: 14px }
+div.serverhead { text-align: center; font-size: 14px }
+div.servermode { text-align: right; font-size: 14px }
+div.errmsg { text-align: center; font-size: 18px; color: #cc0000 }
+div.cmdoutput { color: black; font-weight: normal; font-size: 14px; font-family: Courier, monospace }
Index: systemcheck.php
===================================================================
RCS file: /cvsroot/bobs/bobs/systemcheck.php,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- systemcheck.php 26 Apr 2003 22:39:43 -0000 1.2
+++ systemcheck.php 1 May 2003 05:21:14 -0000 1.3
@@ -160,34 +160,6 @@
putfail();
}
-$incomingdir = $config->get_incomingdir();
-$t->assign ('ITEM', "Checking if $incomingdir is writeable by $httpduser");
-if (is_writeable($incomingdir)) {
- $t->assign ('STATUS', 'PASS');
- putpass();
-} else {
- $t->assign ('STATUS', 'FAIL');
- $t->assign ('HELP', "$httpduser can't write to $incomingdir.<br>
- Run these commands as root:<br>
- chown $httpduser.root $incomingdir<br>
- chmod 755 $incomingdir");
- putfail();
-}
-
-$incrementdir = $config->get_incrementdir();
-$t->assign ('ITEM', "Checking if $incrementdir is writeable by $httpduser");
-if (is_writeable($incrementdir)) {
- $t->assign ('STATUS', 'PASS');
- putpass();
-} else {
- $t->assign ('STATUS', 'FAIL');
- $t->assign ('HELP', "$httpduser can't write to $incrementdir.<br>
- Run these commands as root:<br>
- chown $httpduser.root $incrementdir<br>
- chmod 755 $incrementdir");
- putfail();
-}
-
$freespace = disk_free_space($backupdir);
$meg = round($freespace / 1024 / 1024);
$t->assign ('ITEM', "Free space in $backupdir is $meg M");
@@ -411,6 +383,7 @@
$srvtmpl->parse ('ROW', 'basictest');
$rtnval = submit();
+ $srvtmpl->clear_dynamic ('basictest');
if ($rtnval[0] != -1){
$t->assign ('ITEM', "Testing communication with cmdloop process.<br>
Process said: \"$rtnval[0]\"");
@@ -422,7 +395,32 @@
$t->assign ('HELP', "Didn't get a valid response from cmdloop.");
putfail();
}
- $srvtmpl->clear_dynamic ('basictest');
+
+ // 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.
+
+ $mountdir=$srvcfg->get_mount_dir();
+ if (! is_dir($mountdir)){
+ $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.");
+ $srvtmpl->assign ('MOUNTDIR', "$mountdir");
+ $srvtmpl->parse ('ROW', 'crtmntdir');
+ $rtnval = submit();
+ $srvtmpl->clear_dynamic ('crtmntdir');
+ $cmdoutput = getcmdout($rtnval);
+ if ($rtnval[0] == 0){
+ $t->assign ('STATUS', 'PASS');
+ putpass();
+ } else {
+ $t->assign ('STATUS', 'FAIL');
+ $t->assign ('HELP', "Unable to create mount directories. Message was:<br>
+ $cmdoutput");
+ putfail();
+ return(FALSE); // don't continue testing
+ }
+ }
// Try to mount the selected share.
@@ -444,7 +442,7 @@
$mounted=TRUE;
} else {
$t->assign ('STATUS', 'FAIL');
- $t->assign ('HELP', "Mount failed with this message:<br><pre> $cmdoutput </pre>");
+ $t->assign ('HELP', "Mount failed with this message:<br>$cmdoutput");
putfail();
$mounted=FALSE;
}
@@ -466,12 +464,11 @@
} else {
$t->assign ('STATUS', 'FAIL');
$t->assign ('HELP', "Write file test failed with these messages:<br>
- <pre> $cmdoutput </pre>");
+ $cmdoutput");
putfail();
}
}
-
// Now unmount the share
sleep(5); // Allow time for last operation to finish
@@ -488,12 +485,33 @@
putpass();
} else {
$t->assign ('STATUS', 'FAIL');
- $t->assign ('HELP', "Unmount failed with this message:<br><pre> $cmdoutput </pre>");
+ $t->assign ('HELP', "Unmount failed with this message:<br>$cmdoutput");
putfail();
}
}
+ // See if rsync works
+
+ if ($method == "rsync"){
+ $rsync = "rsync -n " . $server . '::' . $share;
+ $t->assign ('ITEM', "Using rsync to list files for backup method \"$method\" using this command:<br>
+ $rsync");
+ $srvtmpl->assign ('COMMAND', "$rsync"); // the mount command
+ $srvtmpl->parse ('ROW', 'cmdwoutput');
+ $rtnval = submit(); // submit the mount cmd
+ $srvtmpl->clear_dynamic ('cmdwoutput');
+ $cmdoutput = getcmdout($rtnval); // Get the command's output
+ if ($rtnval[0] == 0) {
+ $t->assign ('STATUS', 'PASS');
+ putpass();
+ } else {
+ $t->assign ('STATUS', 'FAIL');
+ $t->assign ('HELP', "Rsync failed with this message:<br>$cmdoutput");
+ putfail();
+ }
+ }
+
// Test mounting and unmounting the 'restore' method
// and reading and writing a file.
@@ -514,7 +532,7 @@
$mounted=TRUE;
} else {
$t->assign ('STATUS', 'FAIL');
- $t->assign ('HELP', "Mount failed with this message:<br><pre> $cmdoutput </pre>");
+ $t->assign ('HELP', "Mount failed with this message:<br>$cmdoutput");
putfail();
$mounted=FALSE;
}
@@ -536,7 +554,7 @@
} else {
$t->assign ('STATUS', 'FAIL');
$t->assign ('HELP', "Write file test failed with these messages:<br>
- <pre> $cmdoutput </pre>");
+ $cmdoutput");
putfail();
}
}
@@ -557,7 +575,7 @@
putpass();
} else {
$t->assign ('STATUS', 'FAIL');
- $t->assign ('HELP', "Unmount failed with this message:<br><pre> $cmdoutput </pre>");
+ $t->assign ('HELP', "Unmount failed with this message:<br>$cmdoutput");
putfail();
}
@@ -569,14 +587,14 @@
$backupdir = $srvcfg->get_backupdir();
$srvbakdir = $backupdir . '/' . $server . '/' . $share;
$t->assign ('ITEM', "Checking for completed backups in $srvbakdir.");
- if ($dir = opendir("$srvbakdir")) {
+ if (is_dir($srvbakdir) && ($dir = opendir($srvbakdir))) {
while (($file = readdir($dir)) && ($backups_exist == FALSE)) {
- if (($file != ".") & ($file != "..")){
+ if (($file != ".") && ($file != "..")){
$backups_exist = TRUE;
}
}
+ closedir($dir);
}
- closedir($dir);
if ($backups_exist == TRUE) {
$t->assign ('STATUS', 'PASS');
@@ -662,8 +680,9 @@
$cmdoutput = "";
foreach (array_slice($rtnval, 1) as $key => $value){
- $cmdoutput .= "$value";
+ $cmdoutput .= nl2br("$value");
}
+ $cmdoutput = '<div class="cmdoutput">' . $cmdoutput . '</div>';
return $cmdoutput;
}
|
|
From: Joe Z. <jz...@us...> - 2003-05-01 05:21:18
|
Update of /cvsroot/bobs/bobs/inc/templates
In directory sc8-pr-cvs1:/tmp/cvs-serv27119/bobs/inc/templates
Modified Files:
servercheck2.sh systemcheck.thtml
Log Message:
Fixup systemcheck.php:
Create mount directories if they don't exist.
Test rsync.
Index: servercheck2.sh
===================================================================
RCS file: /cvsroot/bobs/bobs/inc/templates/servercheck2.sh,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- servercheck2.sh 26 Apr 2003 22:39:43 -0000 1.1
+++ servercheck2.sh 1 May 2003 05:21:15 -0000 1.2
@@ -22,16 +22,26 @@
trap Int14Vector 14 # Timer interrupt (14) subverted for our purposes.
TimerOn
+
<!-- BEGIN DYNAMIC BLOCK: basictest -->
rtnval="ICUUCME"
<!-- END DYNAMIC BLOCK: basictest -->
+
<!-- BEGIN DYNAMIC BLOCK: cmdwoutput -->
cmdoutput=$({COMMAND} 2>&1)
rtncod=$?
rtnval=$(echo "$rtncod"; echo "$cmdoutput";)
<!-- END DYNAMIC BLOCK: cmdwoutput -->
+
+<!-- BEGIN DYNAMIC BLOCK: crtmntdir -->
+cmdoutput=$(umask 0022; mkdir -p "{MOUNTDIR}" 2>&1)
+rtncod=$?
+rtnval=$(echo "$rtncod"; echo "$cmdoutput";)
+<!-- END DYNAMIC BLOCK: crtmntdir -->
+
+
<!-- BEGIN DYNAMIC BLOCK: writetest -->
rtnval="none"
TESTFILE={MOUNTDIR}/bobswritetest.out
@@ -54,6 +64,7 @@
rtncod=$?
rtnval=$(echo "$rtncod"; echo "$cmdoutput";)
<!-- END DYNAMIC BLOCK: writetest -->
+
echo "$rtnval" > {TEMPFILE} # Let the submitting process know my exit status
Index: systemcheck.thtml
===================================================================
RCS file: /cvsroot/bobs/bobs/inc/templates/systemcheck.thtml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- systemcheck.thtml 24 Apr 2003 06:15:59 -0000 1.1
+++ systemcheck.thtml 1 May 2003 05:21:15 -0000 1.2
@@ -1,7 +1,7 @@
<!-- systemcheck.thtml - Template for system check output -->
<center><h1>{TITLE}</h1></center>
-<table align="center" border="1">
+<table align="center" border="1" width="100%">
<!-- BEGIN DYNAMIC BLOCK: itempass -->
<tr>
|
|
From: Joe Z. <jz...@us...> - 2003-04-26 22:39:46
|
Update of /cvsroot/bobs/bobs/inc
In directory sc8-pr-cvs1:/tmp/cvs-serv7450/bobs/inc
Modified Files:
class_server.php header.pinc
Log Message:
Add server specific configuration checks to systemcheck.php.
Index: class_server.php
===================================================================
RCS file: /cvsroot/bobs/bobs/inc/class_server.php,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- class_server.php 7 Sep 2002 20:31:22 -0000 1.2
+++ class_server.php 26 Apr 2003 22:39:43 -0000 1.3
@@ -9,7 +9,7 @@
var $servers = ''; // store for configurations
// server ini files are parsed and
// stored in $servers[] array
- var $config = ''; // config to pass to other classes witha single server configuration,
+ var $config = ''; // config to pass to other classes with a single server configuration,
// also used as a general data store.
// $config should be replaced with class functions,
// but it's pretty ingrained right now.
@@ -192,6 +192,93 @@
}
return;
+}
+
+// ---------------------------------------------------------
+// get_mount_cmd - Build the 'mount' command
+// Used by: systemcheck.php. Should be used by others later.
+// Parms: $bkprst: 'backup' - build mount cmd for backup
+// 'restore' - build mount cmd for restore
+// Returns: The command string to mount the current share
+// Note: set_config() should have been previously called.
+// ---------------------------------------------------------
+function get_mount_cmd($bkprst){
+
+ switch ($bkprst){
+ case 'backup': $method = $this->config['backup_method'];
+ break;
+ case 'restore': $method = $this->config['restore_method'];
+ break;
+ default: return FALSE;
+ }
+
+ $mountdir = $this->get_mount_dir();
+
+ // Server name or ip?
+ if ( $this->server_ip == '' ) {
+ $server_handle = $this->config['server'];
+ } else {
+ $server_handle = $this->config['serverip'];
+ }
+
+ switch ($method){
+ case 'rsync': $mntcmd = ""; // rsync needs no mount cmd
+ break;
+ case 'smb': $mntcmd = 'smbmount "//' . $server_handle . '/' . $this->config['smb_share'] .
+ '" "' . $mountdir . '" -o username=' .
+ $this->config['login'] . ',password=' . $this->config['password'];
+ break;
+ case 'nfs': $mntcmd = 'mount -t nfs ' . '"' . $server_handle . ':' .
+ $this->config['nfs_share'] . '" "' . $mountdir . '"';
+ break;
+ default: $mntcmd = FALSE;
+ }
+ return $mntcmd;
+}
+
+// ---------------------------------------------------------
+// get_umount_cmd - Build the 'umount' command
+// Used by: systemcheck.php. Should be used by others later.
+// Parms: $bkprst: 'backup' - build mount cmd for backup
+// 'restore' - build mount cmd for restore
+// Returns: The command string to unmount the current share
+// Note: set_config() should have been previously called.
+// ---------------------------------------------------------
+function get_umount_cmd($bkprst){
+
+ switch ($bkprst){
+ case 'backup': $method = $this->config['backup_method'];
+ break;
+ case 'restore': $method = $this->config['restore_method'];
+ break;
+ default: return FALSE;
+ }
+
+ $mountdir = $this->get_mount_dir();
+
+ switch ($method){
+ case 'rsync': $umntcmd = ""; // rsync needs no mount cmd
+ break;
+ case 'smb': $umntcmd = 'umount "' . $mountdir . '"';
+ break;
+ case 'nfs': $umntcmd = 'umount "' . $mountdir . '"';
+ break;
+ default: $umntcmd = FALSE;
+ }
+ return $umntcmd;
+}
+
+// ---------------------------------------------------------
+// get_mount_dir - Return the mount directory path
+// Used by: systemcheck.php and $this
+// Parms: none
+// Returns: string - the mount directory path
+// Note: set_config() should have been previously called.
+// ---------------------------------------------------------
+function get_mount_dir(){
+ $mountdir = $this->sys_conf['backupdir'] . '/process/mounts/' .
+ $this->config['server'] . '/' . $this->config['share'];
+ return $mountdir;
}
// ---------------------------------------------------------
Index: header.pinc
===================================================================
RCS file: /cvsroot/bobs/bobs/inc/header.pinc,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- header.pinc 24 Apr 2003 06:15:59 -0000 1.5
+++ header.pinc 26 Apr 2003 22:39:43 -0000 1.6
@@ -1,7 +1,7 @@
<html>
<head>
<title>BOBS Administration</title>
-<link rel="STYLESHEET" href="look.css" type="text/css">
+<link rel="STYLESHEET" href="lookadmin.css" type="text/css">
</head>
<body>
|
|
From: Joe Z. <jz...@us...> - 2003-04-26 22:39:46
|
Update of /cvsroot/bobs/bobs/inc/templates
In directory sc8-pr-cvs1:/tmp/cvs-serv7450/bobs/inc/templates
Added Files:
servercheck2.sh
Log Message:
Add server specific configuration checks to systemcheck.php.
--- NEW FILE: servercheck2.sh ---
#!/bin/bash
# servercheck.sh - Template for system check output
# This will be a generated script
rtnval="none"
# If this script hangs, it will kill itself in this number of seconds
# Timer code taken from "Advanced Bash-Scripting Guide" by Mendel Cooper
TIMELIMIT=10
KILLTIME=30 # In case signal 14 isn't enough
TimerOn() {
# Waits TIMELIMIT seconds, then sends sigalarm to script.
sleep $TIMELIMIT && kill -s 14 $$ 2>/dev/null &
# Waits KILLTIME seconds, then sends sigkill to script.
sleep $KILLTIME && kill -SIGKILL $$ 2>/dev/null &
}
Int14Vector() {
exit 14
}
trap Int14Vector 14 # Timer interrupt (14) subverted for our purposes.
TimerOn
<!-- BEGIN DYNAMIC BLOCK: basictest -->
rtnval="ICUUCME"
<!-- END DYNAMIC BLOCK: basictest -->
<!-- BEGIN DYNAMIC BLOCK: cmdwoutput -->
cmdoutput=$({COMMAND} 2>&1)
rtncod=$?
rtnval=$(echo "$rtncod"; echo "$cmdoutput";)
<!-- END DYNAMIC BLOCK: cmdwoutput -->
<!-- BEGIN DYNAMIC BLOCK: writetest -->
rtnval="none"
TESTFILE={MOUNTDIR}/bobswritetest.out
cmdoutput=$(
{
if [ -e $TESTFILE ]; then
echo "file $TESTFILE already exists."
exit 1;
fi
error=0
rtnval=0
echo "write file test" > $TESTFILE || error=1
cat $TESTFILE || error=1
rm -f $TESTFILE || error=1
if [ $error -eq 1 ]; then
exit 1
fi
} 2>&1 )
rtncod=$?
rtnval=$(echo "$rtncod"; echo "$cmdoutput";)
<!-- END DYNAMIC BLOCK: writetest -->
echo "$rtnval" > {TEMPFILE} # Let the submitting process know my exit status
exit 0
|
|
From: Joe Z. <jz...@us...> - 2003-04-26 22:39:46
|
Update of /cvsroot/bobs/bobs
In directory sc8-pr-cvs1:/tmp/cvs-serv7450/bobs
Modified Files:
Makefile.am Makefile.in TODO admin.php systemcheck.php
Added Files:
lookadmin.css
Log Message:
Add server specific configuration checks to systemcheck.php.
--- NEW FILE: lookadmin.css ---
body { color: black; font-style: normal; font-size: 14px; font-family: Verdana, Helvetica, Arial }
td { color: #000000; font-size: 14px; font-family: Verdana, Helvetica, Arial }
tr { color: #000000; font-size: 14px; font-family: Verdana, Helvetica, Arial }
a:link { color: #000000; text-decoration: none; font-size: 14px; font-family: Verdana, Helvetica, Arial } }
a:visited { color: #000000; text-decoration: none; font-size: 14px; font-family: Verdana, Helvetica, Arial } }
a:hover { color: #000000; text-decoration: underline; font-size: 14px; font-family: Verdana, Helvetica, Arial } }
a:active { color: #000000; text-decoration: none; font-size: 14px; font-family: Verdana, Helvetica, Arial } }
img { border-width: 0px }
img { border: 0px }
div.instruction {text-align: left; font-size: 14px;}
div.serverhead {text-align: center; font-size: 14px;}
div.servermode {text-align: right; font-size: 14px;}
Index: Makefile.am
===================================================================
RCS file: /cvsroot/bobs/bobs/Makefile.am,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -d -r1.12 -r1.13
--- Makefile.am 20 Apr 2003 08:02:51 -0000 1.12
+++ Makefile.am 26 Apr 2003 22:39:43 -0000 1.13
@@ -36,6 +36,12 @@
FILES LICENSE VERSION
#
+# Other files to be removed before distribution
+#
+
+DISTCLEANFILES = *.patch
+
+#
# Other files to be removed for maintainer (me)
#
Index: Makefile.in
===================================================================
RCS file: /cvsroot/bobs/bobs/Makefile.in,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- Makefile.in 24 Apr 2003 06:15:56 -0000 1.10
+++ Makefile.in 26 Apr 2003 22:39:43 -0000 1.11
@@ -110,6 +110,12 @@
#
+# Other files to be removed before distribution
+#
+DISTCLEANFILES = *.patch
+
+
+#
# Other files to be removed for maintainer (me)
#
MAINTAINERCLEANFILES = \
@@ -406,6 +412,7 @@
distclean-generic:
-rm -f Makefile $(CONFIG_CLEAN_FILES)
+ -test -z "$(DISTCLEANFILES)" || rm -f $(DISTCLEANFILES)
maintainer-clean-generic:
@echo "This command is intended for maintainers to use"
Index: TODO
===================================================================
RCS file: /cvsroot/bobs/bobs/TODO,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -d -r1.14 -r1.15
--- TODO 20 Apr 2003 08:02:51 -0000 1.14
+++ TODO 26 Apr 2003 22:39:43 -0000 1.15
@@ -34,6 +34,12 @@
Priority: Medium
Backup directories (/var/bobsdata/) should not be world readable.
Encrypt passwords.
+ Allow changing admin password in browser interface.
+
+User and group administration
+ Priority: Medium
+ Browser interface to allow maintaining authorized users
+ and groups.
Make 'cmdloop' script a service.
Priority: Medium
Index: admin.php
===================================================================
RCS file: /cvsroot/bobs/bobs/admin.php,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -d -r1.18 -r1.19
--- admin.php 24 Apr 2003 06:15:56 -0000 1.18
+++ admin.php 26 Apr 2003 22:39:43 -0000 1.19
@@ -52,7 +52,12 @@
$tableborder = "0";
}
-include("inc/header.pinc");
+// Don't output http header if going to redirect web page
+// Yes, this is sloppy.
+
+if (! ($_POST['selectlist']['action'] == "Check Configuration") ){
+ include_once("inc/header.pinc");
+}
// ----------------------
// Display error message
@@ -92,6 +97,12 @@
edit_server("delete", $server_name, $share_name, $_POST['settings']);
// Server detail: delete mode
break;
+ case ("Check Configuration"): // Test server config
+ $bobsdir = dirname($_SERVER['PHP_SELF']);
+ header("Location: $bobsdir/systemcheck.php?server=$server_name&share=$share_name");
+ // Redirect browser
+ exit;
+ break;
}
break;
case (isset($_POST['edit_server_OK'])): // On edit server detail already
@@ -197,6 +208,7 @@
$serverlist->setadd(); // Show the "Add" button
$serverlist->setchange(); // Show the "Change" button
$serverlist->setdelete(); // Show the "Delete" button
+ $serverlist->addbutton("Check Configuration");// Test the system and server configuration
$serverlist->addinput("Server name : ", 20); // Input fields for "Add" button
$serverlist->addinput("Share description : ", 20);
Index: systemcheck.php
===================================================================
RCS file: /cvsroot/bobs/bobs/systemcheck.php,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- systemcheck.php 24 Apr 2003 06:15:56 -0000 1.1
+++ systemcheck.php 26 Apr 2003 22:39:43 -0000 1.2
@@ -10,10 +10,14 @@
require_once ('inc/class_rfasttemplate.php'); // Template class
require_once("inc/class_config.php"); // configuration class
-include("inc/header.pinc"); // Main menu
+include_once("inc/header.pinc"); // Main menu
$config = new config(); // Create instance of configuration class
+// some global variables
+$backup='';
+$srvtmpl='';
+
$t = new rFastTemplate ('inc/templates');
$t->define (array('content' => 'systemcheck.thtml'));
$t->define_dynamic (array ('item' => 'content', 'help' => 'content'));
@@ -330,10 +334,262 @@
putfail();
}
+// ----------------------------
+// Server specific checks
+// ----------------------------
+
+if (isset($_GET['server']) && $_GET['server'] != "" ) {
+ $server = $_GET['server'];
+ $share = $_GET['share'];
+ $t->assign ('ITEM', "<b>Performing tests on $server / $share<b>");
+ $t->assign ('STATUS', 'INFO');
+ putpass();
+ server_tests($server, $share);
+}
+
+
+
+// ----------------------------
+// End the table and html page
+// ----------------------------
$t->parse ('ROW', 'endtable'); // end the table
echo ($t->fetch());
-echo "</body></html>\n"; // End the html page
+echo "</body></html>\n";
+
+// ----------------------------
+// End of program
+// ----------------------------
+return;
+
+// ========================================================
+// Functions start here
+// ========================================================
+
+// ----------------------------
+// Server specific tests
+// ----------------------------
+function server_tests($server, $share){
+ global $t, $backup, $srvtmpl;
+
+ // Need 'add_queue_command' function from class_backup.php
+
+ $t->assign ('ITEM', "Including file class_backup.php");
+ $return = include_once('inc/class_backup.php');
+ if ($return){
+ $t->assign ('STATUS', 'PASS');
+ putpass();
+ } else {
+ $t->assign ('STATUS', 'FAIL');
+ $t->assign ('HELP', "Unable to include file class_backup.php<br>
+ Cannot perform server tests. Reinstall bobs.");
+ putfail();
+ }
+
+ $t->assign ('ITEM', "Including file class_server.php");
+ $return = include_once('inc/class_server.php');
+ if ($return){
+ $t->assign ('STATUS', 'PASS');
+ putpass();
+ } else {
+ $t->assign ('STATUS', 'FAIL');
+ $t->assign ('HELP', "Unable to include file class_server.php<br>
+ Cannot perform server tests. Reinstall bobs.");
+ putfail();
+ }
+
+ // Instantiate the backup class so I can use add_queue_command()
+
+ $srvcfg = new server();
+ $srvcfg->set_config($server . '.' . $share);
+ $backup = new backup($srvcfg->sys_conf, $srvcfg->config);
+
+ // Test communication with cmdloop process
+
+ $srvtmpl = new rFastTemplate ('inc/templates');
+ $srvtmpl->define (array('srvchk' => 'servercheck2.sh'));
+
+ $srvtmpl->parse ('ROW', 'basictest');
+ $rtnval = submit();
+ if ($rtnval[0] != -1){
+ $t->assign ('ITEM', "Testing communication with cmdloop process.<br>
+ Process said: \"$rtnval[0]\"");
+ $t->assign ('STATUS', 'PASS');
+ putpass();
+ } else {
+ $t->assign ('ITEM', "Testing communication with cmdloop process");
+ $t->assign ('STATUS', 'FAIL');
+ $t->assign ('HELP', "Didn't get a valid response from cmdloop.");
+ putfail();
+ }
+ $srvtmpl->clear_dynamic ('basictest');
+
+ // Try to mount the selected share.
+
+ $config = $srvcfg->get_config();
+
+ $method = $config['backup_method'];
+ if ($method != "rsync"){
+ $mntcmd = $srvcfg->get_mount_cmd('backup');
+ $t->assign ('ITEM', "Attempting to mount for backup method type \"$method\" using this command:<br>
+ $mntcmd");
+ $srvtmpl->assign ('COMMAND', "$mntcmd"); // the mount command
+ $srvtmpl->parse ('ROW', 'cmdwoutput');
+ $rtnval = submit(); // submit the mount cmd
+ $srvtmpl->clear_dynamic ('cmdwoutput');
+ $cmdoutput = getcmdout($rtnval); // Get the command's output
+ if ($rtnval[0] == 0) {
+ $t->assign ('STATUS', 'PASS');
+ putpass();
+ $mounted=TRUE;
+ } else {
+ $t->assign ('STATUS', 'FAIL');
+ $t->assign ('HELP', "Mount failed with this message:<br><pre> $cmdoutput </pre>");
+ putfail();
+ $mounted=FALSE;
+ }
+
+ // Test writing a file to the mounted directory
+
+ if ($mounted == TRUE){
+ $mountdir=$srvcfg->get_mount_dir();
+ $t->assign ('ITEM', "Attempting to write, read and delete a file on<br>
+ $mountdir");
+ $srvtmpl->assign ('MOUNTDIR', "$mountdir"); // the mount command
+ $srvtmpl->parse ('ROW', 'writetest');
+ $rtnval = submit(); // submit the mount cmd
+ $srvtmpl->clear_dynamic ('writetest');
+ $cmdoutput = getcmdout($rtnval); // Get the command's output
+ if ($rtnval[0] == 0) {
+ $t->assign ('STATUS', 'PASS');
+ putpass();
+ } else {
+ $t->assign ('STATUS', 'FAIL');
+ $t->assign ('HELP', "Write file test failed with these messages:<br>
+ <pre> $cmdoutput </pre>");
+ putfail();
+ }
+ }
+
+
+ // Now unmount the share
+
+ sleep(5); // Allow time for last operation to finish
+ $umntcmd = $srvcfg->get_umount_cmd('backup');
+ $t->assign ('ITEM', "Attempting to unmount for backup method type \"$method\" using this command:<br>
+ $umntcmd");
+ $srvtmpl->assign ('COMMAND', "$umntcmd"); // the mount command
+ $srvtmpl->parse ('ROW', 'cmdwoutput');
+ $rtnval = submit(); // submit the mount cmd
+ $srvtmpl->clear_dynamic ('cmdwoutput');
+ $cmdoutput = getcmdout($rtnval); // Get the command's output
+ if ($rtnval[0] == 0) {
+ $t->assign ('STATUS', 'PASS');
+ putpass();
+ } else {
+ $t->assign ('STATUS', 'FAIL');
+ $t->assign ('HELP', "Unmount failed with this message:<br><pre> $cmdoutput </pre>");
+ putfail();
+ }
+
+ }
+
+ // Test mounting and unmounting the 'restore' method
+ // and reading and writing a file.
+
+ sleep(5); // Allow time for last operation to finish
+ $method = $config['restore_method'];
+ if ($method != "rsync"){
+ $mntcmd = $srvcfg->get_mount_cmd('restore');
+ $t->assign ('ITEM', "Attempting to mount for restore method type \"$method\" using this command:<br>
+ $mntcmd");
+ $srvtmpl->assign ('COMMAND', "$mntcmd"); // the mount command
+ $srvtmpl->parse ('ROW', 'cmdwoutput');
+ $rtnval = submit(); // submit the mount cmd
+ $srvtmpl->clear_dynamic ('cmdwoutput');
+ $cmdoutput = getcmdout($rtnval); // Get the command's output
+ if ($rtnval[0] == 0) {
+ $t->assign ('STATUS', 'PASS');
+ putpass();
+ $mounted=TRUE;
+ } else {
+ $t->assign ('STATUS', 'FAIL');
+ $t->assign ('HELP', "Mount failed with this message:<br><pre> $cmdoutput </pre>");
+ putfail();
+ $mounted=FALSE;
+ }
+
+ // Test writing a file to the mounted directory
+
+ if ($mounted == TRUE){
+ $mountdir=$srvcfg->get_mount_dir();
+ $t->assign ('ITEM', "Attempting to write, read and delete a file on<br>
+ $mountdir");
+ $srvtmpl->assign ('MOUNTDIR', "$mountdir"); // the mount command
+ $srvtmpl->parse ('ROW', 'writetest');
+ $rtnval = submit(); // submit the mount cmd
+ $srvtmpl->clear_dynamic ('writetest');
+ $cmdoutput = getcmdout($rtnval); // Get the command's output
+ if ($rtnval[0] == 0) {
+ $t->assign ('STATUS', 'PASS');
+ putpass();
+ } else {
+ $t->assign ('STATUS', 'FAIL');
+ $t->assign ('HELP', "Write file test failed with these messages:<br>
+ <pre> $cmdoutput </pre>");
+ putfail();
+ }
+ }
+
+ // Now unmount the share
+
+ sleep(5); // Allow time for last operation to finish
+ $umntcmd = $srvcfg->get_umount_cmd('restore');
+ $t->assign ('ITEM', "Attempting to unmount for restore method type \"$method\" using this command:<br>
+ $umntcmd.");
+ $srvtmpl->assign ('COMMAND', "$umntcmd"); // the mount command
+ $srvtmpl->parse ('ROW', 'cmdwoutput');
+ $rtnval = submit(); // submit the mount cmd
+ $srvtmpl->clear_dynamic ('cmdwoutput');
+ $cmdoutput = getcmdout($rtnval); // Get the command's output
+ if ($rtnval[0] == 0) {
+ $t->assign ('STATUS', 'PASS');
+ putpass();
+ } else {
+ $t->assign ('STATUS', 'FAIL');
+ $t->assign ('HELP', "Unmount failed with this message:<br><pre> $cmdoutput </pre>");
+ putfail();
+ }
+
+ }
+
+ // See if any backups have completed
+
+ $backups_exist = FALSE;
+ $backupdir = $srvcfg->get_backupdir();
+ $srvbakdir = $backupdir . '/' . $server . '/' . $share;
+ $t->assign ('ITEM', "Checking for completed backups in $srvbakdir.");
+ if ($dir = opendir("$srvbakdir")) {
+ while (($file = readdir($dir)) && ($backups_exist == FALSE)) {
+ if (($file != ".") & ($file != "..")){
+ $backups_exist = TRUE;
+ }
+ }
+ }
+ closedir($dir);
+
+ if ($backups_exist == TRUE) {
+ $t->assign ('STATUS', 'PASS');
+ putpass();
+ } else {
+ $t->assign ('STATUS', 'WARN');
+ $t->assign ('HELP', "I didn't find any backup files.<br>
+ This is normal for a new installation.<br>
+ You won't be able to use the bobs 'restore' menu
+ until a backup has successfully completed.");
+ putfail();
+ }
+}
// ----------------------------
// Output a passed template row
@@ -360,4 +616,56 @@
$t->clear_dynamic ('help');
}
-return;
+// ----------------------------
+// Submit a script to be processed by cmdloop
+// ----------------------------
+function submit(){
+ global $backup, $srvtmpl;
+
+ // Generate a temporary file name for return status
+ //$pid = posix_getpid(); // Current process id
+ $id = uniqid(bobssrvchk);
+ $tempfile = "/tmp/" . "$id";
+ `umask 077; touch $tempfile`; // I need to create it so I can delete it
+
+ $srvtmpl->assign ('TEMPFILE', $tempfile);
+ $srvtmpl->parse ('SRVCHK', 'srvchk');
+ $script = $srvtmpl->fetch();
+ $backup->add_queue_command($script, 'bash'); // submit the script to run under cmdloop
+
+ // Read the response from the fifo
+ $maxsec = 20; // max seconds to wait for script
+ $count = 0;
+ $filesize = 0;
+ while ($filesize == 0 && $count < $maxsec) {
+ $count += 1;
+ sleep(1);
+ clearstatcache();
+ $stats = stat("$tempfile");
+ $filesize = $stats[7]; // element 8 is file size
+ }
+
+ // Read the script output
+ if ($filesize > 0) {
+ $fout = file($tempfile);
+ unlink($tempfile); // cleanup: delete the temp file
+ return($fout); // return the script output
+ }
+ unlink($tempfile); // cleanup: delete the temp file
+ return(array(-1, 'Operation timed out.'));
+}
+
+// ----------------------------
+// Get just the output portion of the submit() return value
+// ----------------------------
+function getcmdout($rtnval){
+ $cmdoutput = "";
+
+ foreach (array_slice($rtnval, 1) as $key => $value){
+ $cmdoutput .= "$value";
+ }
+ return $cmdoutput;
+}
+
+// THE END
+?>
|
|
From: Joe Z. <jz...@us...> - 2003-04-24 06:16:49
|
Update of /cvsroot/bobs/bobs/images/bar In directory sc8-pr-cvs1:/tmp/cvs-serv31230/bobs/images/bar Modified Files: Makefile.in Log Message: Created a page to check bobs configuration: systemcheck.php Index: Makefile.in =================================================================== RCS file: /cvsroot/bobs/bobs/images/bar/Makefile.in,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- Makefile.in 20 Apr 2003 08:02:53 -0000 1.3 +++ Makefile.in 24 Apr 2003 06:15:58 -0000 1.4 @@ -81,6 +81,8 @@ myPASS = @myPASS@ myWEBDIR = @myWEBDIR@ myrealBOBSDATA = @myrealBOBSDATA@ +myrealCRONDIR = @myrealCRONDIR@ +myrealCRONTABDIR = @myrealCRONTABDIR@ myrealWEBDIR = @myrealWEBDIR@ htmldir = $(myWEBDIR)/images/bar |
|
From: Joe Z. <jz...@us...> - 2003-04-24 06:16:49
|
Update of /cvsroot/bobs/bobs/inc
In directory sc8-pr-cvs1:/tmp/cvs-serv31230/bobs/inc
Modified Files:
Makefile.in class_config.php config.php.in header.pinc
Log Message:
Created a page to check bobs configuration: systemcheck.php
Index: Makefile.in
===================================================================
RCS file: /cvsroot/bobs/bobs/inc/Makefile.in,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- Makefile.in 20 Apr 2003 08:02:55 -0000 1.3
+++ Makefile.in 24 Apr 2003 06:15:58 -0000 1.4
@@ -81,6 +81,8 @@
myPASS = @myPASS@
myWEBDIR = @myWEBDIR@
myrealBOBSDATA = @myrealBOBSDATA@
+myrealCRONDIR = @myrealCRONDIR@
+myrealCRONTABDIR = @myrealCRONTABDIR@
myrealWEBDIR = @myrealWEBDIR@
SUBDIRS = excludes servers templates
Index: class_config.php
===================================================================
RCS file: /cvsroot/bobs/bobs/inc/class_config.php,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -d -r1.12 -r1.13
--- class_config.php 1 Sep 2002 02:24:44 -0000 1.12
+++ class_config.php 24 Apr 2003 06:15:59 -0000 1.13
@@ -38,5 +38,59 @@
return $this->sys_conf['siteroot'];
}
+// ---------------------------------------------------------
+// get_datadir - Return BOBS data directory name
+// Used by: servercheck.php
+// Returns: BOBS data directory name
+// ---------------------------------------------------------
+function get_datadir(){
+ return $this->sys_conf['datadir'];
+}
+
+// ---------------------------------------------------------
+// get_backupdir - Return BOBS backup directory name
+// Used by: servercheck.php
+// Returns: BOBS backup directory name
+// ---------------------------------------------------------
+function get_backupdir(){
+ return $this->sys_conf['backupdir'];
+}
+
+// ---------------------------------------------------------
+// get_incomingdir - Return BOBS incoming directory name
+// Used by: servercheck.php
+// Returns: BOBS incoming directory name
+// ---------------------------------------------------------
+function get_incomingdir(){
+ return $this->sys_conf['incomingdir'];
+}
+
+// ---------------------------------------------------------
+// get_incrementdir - Return BOBS incremental backup directory name
+// Used by: servercheck.php
+// Returns: BOBS incremental backup directory name
+// ---------------------------------------------------------
+function get_incrementdir(){
+ return $this->sys_conf['incrementdir'];
+}
+
+// ---------------------------------------------------------
+// get_crondir - Return the cron daily directory name
+// Used by: servercheck.php
+// Returns: Cron daily directory name
+// ---------------------------------------------------------
+function get_crondir(){
+ 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.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- config.php.in 5 Feb 2003 02:05:24 -0000 1.5
+++ config.php.in 24 Apr 2003 06:15:59 -0000 1.6
@@ -6,6 +6,9 @@
// define locations of various files
+// Base data directory
+$sys_conf["datadir"] = '@myrealBOBSDATA@';
+
// Base dir to do full current backups. This is where
// the current backup will be stored.
$sys_conf["backupdir"] = '@myrealBOBSDATA@/current';
@@ -20,6 +23,10 @@
// root of the bobs site.
$sys_conf["siteroot"] = '@myrealWEBDIR@';
+
+// Cron daily and crontab locations
+$sys_conf["crondir"] = '@myrealCRONDIR@';
+$sys_conf["crontabdir"] = '@myrealCRONTABDIR@';
// Server definition template
Index: header.pinc
===================================================================
RCS file: /cvsroot/bobs/bobs/inc/header.pinc,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- header.pinc 24 Mar 2003 05:37:39 -0000 1.4
+++ header.pinc 24 Apr 2003 06:15:59 -0000 1.5
@@ -10,19 +10,19 @@
<tr>
<td align="center" bgcolor="#707070" width="20%">
<a href=admin.php?menu_logout=1>
- <img src="images/menu/menu_logout.png" border="0"></a></td>
+ <img src="images/menu/menu_logout.png" border="0"></a></td>
<td align="center" bgcolor="#707070" width="20%">
<a href=admin.php?menu_servers=1>
- <img src="images/menu/menu_servers.png" border="0"></a></td>
+ <img src="images/menu/menu_servers.png" border="0"></a></td>
<td align="center" bgcolor="#707070" width="20%">
<a href=admin.php?menu_access=1>
- <img src="images/menu/menu_access.png" border="0"></a></td>
+ <img src="images/menu/menu_access.png" border="0"></a></td>
<td align="center" bgcolor="#707070" width="20%">
<a href=admin.php?menu_bobs=1>
- <img src="images/menu/menu_restore.png" border="0"></a></td>
+ <img src="images/menu/menu_restore.png" border="0"></a></td>
<td align="center" bgcolor="#707070" width="20%">
<a href=admin.php?menu_help=1>
- <img src="images/menu/menu_help.png" border="0"></a></td>
+ <img src="images/menu/menu_help.png" border="0"></a></td>
</tr>
</table>
|
|
From: Joe Z. <jz...@us...> - 2003-04-24 06:16:32
|
Update of /cvsroot/bobs/bobs/images/menu In directory sc8-pr-cvs1:/tmp/cvs-serv31230/bobs/images/menu Modified Files: Makefile.in Log Message: Created a page to check bobs configuration: systemcheck.php Index: Makefile.in =================================================================== RCS file: /cvsroot/bobs/bobs/images/menu/Makefile.in,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- Makefile.in 20 Apr 2003 08:02:54 -0000 1.3 +++ Makefile.in 24 Apr 2003 06:15:58 -0000 1.4 @@ -81,6 +81,8 @@ myPASS = @myPASS@ myWEBDIR = @myWEBDIR@ myrealBOBSDATA = @myrealBOBSDATA@ +myrealCRONDIR = @myrealCRONDIR@ +myrealCRONTABDIR = @myrealCRONTABDIR@ myrealWEBDIR = @myrealWEBDIR@ htmldir = $(myWEBDIR)/images/menu |
|
From: Joe Z. <jz...@us...> - 2003-04-24 06:16:31
|
Update of /cvsroot/bobs/bobs/images In directory sc8-pr-cvs1:/tmp/cvs-serv31230/bobs/images Modified Files: Makefile.in Log Message: Created a page to check bobs configuration: systemcheck.php Index: Makefile.in =================================================================== RCS file: /cvsroot/bobs/bobs/images/Makefile.in,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- Makefile.in 20 Apr 2003 08:02:53 -0000 1.3 +++ Makefile.in 24 Apr 2003 06:15:58 -0000 1.4 @@ -81,6 +81,8 @@ myPASS = @myPASS@ myWEBDIR = @myWEBDIR@ myrealBOBSDATA = @myrealBOBSDATA@ +myrealCRONDIR = @myrealCRONDIR@ +myrealCRONTABDIR = @myrealCRONTABDIR@ myrealWEBDIR = @myrealWEBDIR@ SUBDIRS = bar menu |
|
From: Joe Z. <jz...@us...> - 2003-04-24 06:16:31
|
Update of /cvsroot/bobs/bobs/doc In directory sc8-pr-cvs1:/tmp/cvs-serv31230/bobs/doc Modified Files: Makefile.in Log Message: Created a page to check bobs configuration: systemcheck.php Index: Makefile.in =================================================================== RCS file: /cvsroot/bobs/bobs/doc/Makefile.in,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- Makefile.in 20 Apr 2003 08:02:52 -0000 1.3 +++ Makefile.in 24 Apr 2003 06:15:57 -0000 1.4 @@ -83,6 +83,8 @@ myPASS = @myPASS@ myWEBDIR = @myWEBDIR@ myrealBOBSDATA = @myrealBOBSDATA@ +myrealCRONDIR = @myrealCRONDIR@ +myrealCRONTABDIR = @myrealCRONTABDIR@ myrealWEBDIR = @myrealWEBDIR@ EXTRA_DIST = assign.php fileformat list.php |
|
From: Joe Z. <jz...@us...> - 2003-04-24 06:16:30
|
Update of /cvsroot/bobs/bobs/cron In directory sc8-pr-cvs1:/tmp/cvs-serv31230/bobs/cron Modified Files: Makefile.in Log Message: Created a page to check bobs configuration: systemcheck.php Index: Makefile.in =================================================================== RCS file: /cvsroot/bobs/bobs/cron/Makefile.in,v retrieving revision 1.4 retrieving revision 1.5 diff -u -d -r1.4 -r1.5 --- Makefile.in 20 Apr 2003 08:02:52 -0000 1.4 +++ Makefile.in 24 Apr 2003 06:15:57 -0000 1.5 @@ -83,6 +83,8 @@ myPASS = @myPASS@ myWEBDIR = @myWEBDIR@ myrealBOBSDATA = @myrealBOBSDATA@ +myrealCRONDIR = @myrealCRONDIR@ +myrealCRONTABDIR = @myrealCRONTABDIR@ myrealWEBDIR = @myrealWEBDIR@ crondir = $(myCRONDIR) |
|
From: Joe Z. <jz...@us...> - 2003-04-24 06:16:30
|
Update of /cvsroot/bobs/bobs
In directory sc8-pr-cvs1:/tmp/cvs-serv31230/bobs
Modified Files:
Makefile.in admin.php configure configure.in
Added Files:
systemcheck.php
Log Message:
Created a page to check bobs configuration: systemcheck.php
--- NEW FILE: systemcheck.php ---
<?php
// systemcheck.php - Verify bobs is configured properly and working
if (isset($_GET['menu_bobs'])){ // BOBS menu button pushed
$bobsdir = dirname($_SERVER['PHP_SELF']);
header("Location: $bobsdir"); // Redirect browser to BOBS main index
exit; // Make sure that code below does not get executed
}
require_once ('inc/class_rfasttemplate.php'); // Template class
require_once("inc/class_config.php"); // configuration class
include("inc/header.pinc"); // Main menu
$config = new config(); // Create instance of configuration class
$t = new rFastTemplate ('inc/templates');
$t->define (array('content' => 'systemcheck.thtml'));
$t->define_dynamic (array ('item' => 'content', 'help' => 'content'));
// Heading
$t->assign ('TITLE', 'System check');
$t->parse ('CONTENT', 'content');
echo ($t->fetch());
// --------------------------------
// Site root
// --------------------------------
$siteroot = $config->get_siteroot();
$t->assign ('ITEM', "Bobs site root directory is $siteroot");
if (strlen($siteroot) <= 0){
$t->assign ('STATUS', 'FAIL');
$t->assign ('HELP', "Siteroot is not set in config.php.<br>
Reinstall bobs or manually edit the config.php
file in bobs web directory.");
putfail();
} else {
$t->assign ('STATUS', 'PASS');
putpass();
}
$t->assign ('ITEM', "Checking if $siteroot exists");
if (is_dir($siteroot)) {
$t->assign ('STATUS', 'PASS');
putpass();
} else {
$t->assign ('STATUS', 'FAIL');
$t->assign ('HELP', "siteroot directory $siteroot does not exist.<br>
Bobs is not properly installed. Reinstall bobs.");
putfail();
}
$t->assign ('ITEM', "Checking if $siteroot is readable");
if (is_readable($siteroot)) {
$t->assign ('STATUS', 'PASS');
putpass();
} else {
$t->assign ('STATUS', 'FAIL');
$t->assign ('HELP', "Siteroot directory $siteroot is not readable.<br>
Check the directory permissions or reinstall bobs.");
putfail();
}
// --------------------------------
// Server directory
// --------------------------------
$serverdir = $siteroot . '/inc/servers';
$t->assign ('ITEM', "Checking if $serverdir exists");
if (is_dir($serverdir)) {
$t->assign ('STATUS', 'PASS');
putpass();
} else {
$t->assign ('STATUS', 'FAIL');
$t->assign ('HELP', "Servers directory $serverdir does not exist.<br>
Bobs is not properly installed. Reinstall bobs.");
putfail();
}
$httpduser = rtrim(`whoami`);
$t->assign ('ITEM', "Web server is running as user id $httpduser");
$t->assign ('STATUS', 'INFO');
putpass();
$serverdir = $siteroot . '/inc/servers';
$t->assign ('ITEM', "Checking if $serverdir is writeable by $httpduser");
if (is_writeable($serverdir)) {
$t->assign ('STATUS', 'PASS');
putpass();
} else {
$t->assign ('STATUS', 'FAIL');
$t->assign ('HELP', "$httpduser can't write to $serverdir.<br>
Run these commands as root:<br>
chown $httpduser.root $serverdir<br>
chmod 755 $serverdir");
putfail();
}
// --------------------------------
// Default password
// --------------------------------
$t->assign ('ITEM', "Checking if default administrator password has been changed");
if ($config->admin_pwd != 'admin'){
$t->assign ('STATUS', 'PASS');
putpass();
} else {
$t->assign ('STATUS', 'WARN');
$t->assign ('HELP', "The default administrator password has not been changed.<br>
See the bobs INSTALL document.");
putfail();
}
// --------------------------------
// Data directory
// --------------------------------
$datadir = $config->get_datadir();
$t->assign ('ITEM', "Bobs data directory is $datadir");
if (strlen($datadir) <= 0){
$t->assign ('STATUS', 'FAIL');
$t->assign ('HELP', "datadir is not set in config.php.<br>
Reinstall bobs or manually edit the config.php
file in bobs web directory.");
putfail();
} else {
$t->assign ('STATUS', 'PASS');
putpass();
}
$t->assign ('ITEM', "Checking if $datadir exists");
if (is_dir($datadir)) {
$t->assign ('STATUS', 'PASS');
putpass();
} else {
$t->assign ('STATUS', 'FAIL');
$t->assign ('HELP', "Bobs data directory $datadir does not exist.<br>
Bobs is not properly installed. Reinstall bobs.");
putfail();
}
$backupdir = $config->get_backupdir();
$t->assign ('ITEM', "Checking if $backupdir is writeable by $httpduser");
if (is_writeable($backupdir)) {
$t->assign ('STATUS', 'PASS');
putpass();
} else {
$t->assign ('STATUS', 'FAIL');
$t->assign ('HELP', "$httpduser can't write to $backupdir.<br>
Run these commands as root:<br>
chown $httpduser.root $backupdir<br>
chmod 755 $backupdir");
putfail();
}
$incomingdir = $config->get_incomingdir();
$t->assign ('ITEM', "Checking if $incomingdir is writeable by $httpduser");
if (is_writeable($incomingdir)) {
$t->assign ('STATUS', 'PASS');
putpass();
} else {
$t->assign ('STATUS', 'FAIL');
$t->assign ('HELP', "$httpduser can't write to $incomingdir.<br>
Run these commands as root:<br>
chown $httpduser.root $incomingdir<br>
chmod 755 $incomingdir");
putfail();
}
$incrementdir = $config->get_incrementdir();
$t->assign ('ITEM', "Checking if $incrementdir is writeable by $httpduser");
if (is_writeable($incrementdir)) {
$t->assign ('STATUS', 'PASS');
putpass();
} else {
$t->assign ('STATUS', 'FAIL');
$t->assign ('HELP', "$httpduser can't write to $incrementdir.<br>
Run these commands as root:<br>
chown $httpduser.root $incrementdir<br>
chmod 755 $incrementdir");
putfail();
}
$freespace = disk_free_space($backupdir);
$meg = round($freespace / 1024 / 1024);
$t->assign ('ITEM', "Free space in $backupdir is $meg M");
if ($meg >= 100) {
$t->assign ('STATUS', 'PASS');
putpass();
} else {
$t->assign ('STATUS', 'FAIL');
$t->assign ('HELP', "You only have $meg megabytes of free space on $backupdir.");
putfail();
}
// --------------------------------
// Check cron daily and backup.php
// --------------------------------
$crondir = $config->get_crondir();
$t->assign ('ITEM', "Bobs cron daily directory is $crondir");
if (strlen($crondir) <= 0){
$t->assign ('STATUS', 'FAIL');
$t->assign ('HELP', "The location of the daily cron files has not been set.<br>
This is usually /etc/cron.daily/.<br>
Reinstall bobs and manually specify --with-crondir=DIR<br>
if it is not set automatically.");
putfail();
} else {
$t->assign ('STATUS', 'PASS');
putpass();
}
$cronbackup = $crondir . '/backup.php';
$t->assign ('ITEM', "Checking if $cronbackup exists and is executable");
if (is_executable($cronbackup)) {
$t->assign ('STATUS', 'PASS');
putpass();
} else {
$t->assign ('STATUS', 'FAIL');
$t->assign ('HELP', "$cronbackup either doesn't exist or is not executable.<br>
Run ./configure from the install directory and<br>
see if 'cron directory = /etc/cron.daily'");
putfail();
}
// --------------------------------
// Check crontab
// --------------------------------
$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>
cmdloop process id is $pid");
$t->assign ('STATUS', 'PASS');
putpass();
} else {
$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.");
putfail();
}
// --------------------------------
// database support
// --------------------------------
$t->assign ('ITEM', "Checking for dba database support");
if (extension_loaded("dba")) {
$t->assign ('STATUS', 'PASS');
putpass();
} else {
$t->assign ('STATUS', 'FAIL');
$t->assign ('HELP', "dba database support is not loaded.<br>
You need to check your php configuration and include dba support.");
putfail();
}
$t->assign ('ITEM', "Checking for db3 database support");
$tempfile = '/tmp/bobstest' . posix_getpid();
$handle = dba_open("$tempfile", "c", "db3"); // open a temporary database
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();
}
$t->parse ('ROW', 'endtable'); // end the table
echo ($t->fetch());
echo "</body></html>\n"; // End the html page
// ----------------------------
// Output a passed template row
// ----------------------------
function putpass(){
global $t;
$t->parse ('ROW', 'itempass');
echo ($t->fetch());
$t->clear_dynamic ('itempass');
}
// ----------------------------
// Output a failed template row
// ----------------------------
function putfail(){
global $t;
$t->parse ('ROW', 'itemfail');
echo ($t->fetch());
$t->clear_dynamic ('itemfail');
$t->parse ('HELP', 'help');
echo ($t->fetch());
$t->clear_dynamic ('help');
}
return;
Index: Makefile.in
===================================================================
RCS file: /cvsroot/bobs/bobs/Makefile.in,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- Makefile.in 20 Apr 2003 08:02:51 -0000 1.9
+++ Makefile.in 24 Apr 2003 06:15:56 -0000 1.10
@@ -88,6 +88,8 @@
myPASS = @myPASS@
myWEBDIR = @myWEBDIR@
myrealBOBSDATA = @myrealBOBSDATA@
+myrealCRONDIR = @myrealCRONDIR@
+myrealCRONTABDIR = @myrealCRONTABDIR@
myrealWEBDIR = @myrealWEBDIR@
SUBDIRS = bash doc cron images inc js winc man
Index: admin.php
===================================================================
RCS file: /cvsroot/bobs/bobs/admin.php,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -d -r1.17 -r1.18
--- admin.php 24 Mar 2003 05:37:39 -0000 1.17
+++ admin.php 24 Apr 2003 06:15:56 -0000 1.18
@@ -2,7 +2,7 @@
// BOBS Administration Interface
-if (isset($_GET['menu_bobs'])){ // BOBS menu button pushed
+if (isset($_GET['menu_bobs'])){ // BOBS menu button pushed
$bobsdir = dirname($_SERVER['PHP_SELF']);
header("Location: $bobsdir"); // Redirect browser to BOBS main index
exit; // Make sure that code below does not get executed
@@ -108,7 +108,7 @@
select_server(); // Back to server selection screen
break;
default:
- echo "DEFAULT!";
+ echo "That function is not yet implemented.";
break;
}
Index: configure
===================================================================
RCS file: /cvsroot/bobs/bobs/configure,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- configure 20 Apr 2003 08:02:51 -0000 1.8
+++ configure 24 Apr 2003 06:15:56 -0000 1.9
@@ -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 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 myCRONTABDIR myMANDIR myPASS myHTTPDUSER myrealBOBSDATA myrealWEBDIR myrealCRONDIR myrealCRONTABDIR LIBOBJS LTLIBOBJS'
ac_subst_files=''
# Initialize some variables set by options.
@@ -1761,6 +1761,18 @@
)`
+myrealCRONDIR=`(
+ test "x$prefix" = xNONE && prefix=$ac_default_prefix
+ eval echo "$myCRONDIR"
+)`
+
+
+myrealCRONTABDIR=`(
+ test "x$prefix" = xNONE && prefix=$ac_default_prefix
+ eval echo "$myCRONTABDIR"
+)`
+
+
ac_config_files="$ac_config_files inc/config.php cron/backup.php cron/check_loop"
cat >confcache <<\_ACEOF
# This file is a shell script that caches the results of configure
@@ -2438,6 +2450,8 @@
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,@LIBOBJS@,$LIBOBJS,;t t
s,@LTLIBOBJS@,$LTLIBOBJS,;t t
CEOF
@@ -2688,4 +2702,5 @@
echo ""
echo "*** $WARNCOUNT warning(s)"
echo ""
+
Index: configure.in
===================================================================
RCS file: /cvsroot/bobs/bobs/configure.in,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- configure.in 20 Apr 2003 08:02:52 -0000 1.10
+++ configure.in 24 Apr 2003 06:15:56 -0000 1.11
@@ -156,6 +156,18 @@
)`
AC_SUBST(myrealWEBDIR)
+myrealCRONDIR=`(
+ test "x$prefix" = xNONE && prefix=$ac_default_prefix
+ eval echo "$myCRONDIR"
+)`
+AC_SUBST(myrealCRONDIR)
+
+myrealCRONTABDIR=`(
+ test "x$prefix" = xNONE && prefix=$ac_default_prefix
+ eval echo "$myCRONTABDIR"
+)`
+AC_SUBST(myrealCRONTABDIR)
+
AC_OUTPUT([
inc/config.php
cron/backup.php
@@ -177,6 +189,7 @@
echo ""
echo "*** $WARNCOUNT warning(s)"
echo ""
+
dnl> echo "The following is just for testing and will be removed:"
dnl> echo ""
dnl> echo "prefix: ${prefix}"
|
|
From: Joe Z. <jz...@us...> - 2003-04-24 06:16:30
|
Update of /cvsroot/bobs/bobs/bash In directory sc8-pr-cvs1:/tmp/cvs-serv31230/bobs/bash Modified Files: Makefile.in Log Message: Created a page to check bobs configuration: systemcheck.php Index: Makefile.in =================================================================== RCS file: /cvsroot/bobs/bobs/bash/Makefile.in,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- Makefile.in 20 Apr 2003 08:02:52 -0000 1.3 +++ Makefile.in 24 Apr 2003 06:15:57 -0000 1.4 @@ -83,6 +83,8 @@ myPASS = @myPASS@ myWEBDIR = @myWEBDIR@ myrealBOBSDATA = @myrealBOBSDATA@ +myrealCRONDIR = @myrealCRONDIR@ +myrealCRONTABDIR = @myrealCRONTABDIR@ myrealWEBDIR = @myrealWEBDIR@ processdir = $(myBOBSDATA)/current/process |
|
From: Joe Z. <jz...@us...> - 2003-04-24 06:16:07
|
Update of /cvsroot/bobs/bobs/js In directory sc8-pr-cvs1:/tmp/cvs-serv31230/bobs/js Modified Files: Makefile.in Log Message: Created a page to check bobs configuration: systemcheck.php Index: Makefile.in =================================================================== RCS file: /cvsroot/bobs/bobs/js/Makefile.in,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- Makefile.in 20 Apr 2003 08:02:56 -0000 1.3 +++ Makefile.in 24 Apr 2003 06:15:59 -0000 1.4 @@ -81,6 +81,8 @@ myPASS = @myPASS@ myWEBDIR = @myWEBDIR@ myrealBOBSDATA = @myrealBOBSDATA@ +myrealCRONDIR = @myrealCRONDIR@ +myrealCRONTABDIR = @myrealCRONTABDIR@ myrealWEBDIR = @myrealWEBDIR@ htmldir = $(myWEBDIR)/js |
|
From: Joe Z. <jz...@us...> - 2003-04-24 06:16:07
|
Update of /cvsroot/bobs/bobs/inc/templates
In directory sc8-pr-cvs1:/tmp/cvs-serv31230/bobs/inc/templates
Modified Files:
Makefile.am Makefile.in
Added Files:
systemcheck.thtml
Log Message:
Created a page to check bobs configuration: systemcheck.php
--- NEW FILE: systemcheck.thtml ---
<!-- systemcheck.thtml - Template for system check output -->
<center><h1>{TITLE}</h1></center>
<table align="center" border="1">
<!-- BEGIN DYNAMIC BLOCK: itempass -->
<tr>
<td>{ITEM}</td>
<td><font color="green">{STATUS}</font></td>
</tr>
<!-- END DYNAMIC BLOCK: itempass -->
<!-- BEGIN DYNAMIC BLOCK: itemfail -->
<tr>
<td>{ITEM}</td>
<td><font color="red">{STATUS}</font></td>
</tr>
<!-- END DYNAMIC BLOCK: itemfail -->
<!-- BEGIN DYNAMIC BLOCK: help -->
<tr>
<td colspan="2">{HELP}</td>
</tr>
<!-- END DYNAMIC BLOCK: help -->
<!-- BEGIN DYNAMIC BLOCK: endtable -->
</table>
<!-- END DYNAMIC BLOCK: endtable -->
Index: Makefile.am
===================================================================
RCS file: /cvsroot/bobs/bobs/inc/templates/Makefile.am,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- Makefile.am 5 Feb 2003 02:05:24 -0000 1.3
+++ Makefile.am 24 Apr 2003 06:15:59 -0000 1.4
@@ -1,6 +1,6 @@
htmldir = $(myWEBDIR)/inc/templates
-dist_html_DATA = $(wildcard *.php *.sh)
+dist_html_DATA = $(wildcard *.php *.sh *.thtml)
## END
Index: Makefile.in
===================================================================
RCS file: /cvsroot/bobs/bobs/inc/templates/Makefile.in,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- Makefile.in 20 Apr 2003 08:02:56 -0000 1.3
+++ Makefile.in 24 Apr 2003 06:15:59 -0000 1.4
@@ -81,11 +81,13 @@
myPASS = @myPASS@
myWEBDIR = @myWEBDIR@
myrealBOBSDATA = @myrealBOBSDATA@
+myrealCRONDIR = @myrealCRONDIR@
+myrealCRONTABDIR = @myrealCRONTABDIR@
myrealWEBDIR = @myrealWEBDIR@
htmldir = $(myWEBDIR)/inc/templates
-dist_html_DATA = $(wildcard *.php *.sh)
+dist_html_DATA = $(wildcard *.php *.sh *.thtml)
subdir = inc/templates
mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
CONFIG_CLEAN_FILES =
|
|
From: Joe Z. <jz...@us...> - 2003-04-24 06:16:07
|
Update of /cvsroot/bobs/bobs/inc/excludes In directory sc8-pr-cvs1:/tmp/cvs-serv31230/bobs/inc/excludes Modified Files: Makefile.in Log Message: Created a page to check bobs configuration: systemcheck.php Index: Makefile.in =================================================================== RCS file: /cvsroot/bobs/bobs/inc/excludes/Makefile.in,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- Makefile.in 20 Apr 2003 08:02:55 -0000 1.3 +++ Makefile.in 24 Apr 2003 06:15:59 -0000 1.4 @@ -81,6 +81,8 @@ myPASS = @myPASS@ myWEBDIR = @myWEBDIR@ myrealBOBSDATA = @myrealBOBSDATA@ +myrealCRONDIR = @myrealCRONDIR@ +myrealCRONTABDIR = @myrealCRONTABDIR@ myrealWEBDIR = @myrealWEBDIR@ htmldir = $(myWEBDIR)/inc/excludes |
|
From: Joe Z. <jz...@us...> - 2003-04-24 06:16:07
|
Update of /cvsroot/bobs/bobs/inc/servers In directory sc8-pr-cvs1:/tmp/cvs-serv31230/bobs/inc/servers Modified Files: Makefile.in Log Message: Created a page to check bobs configuration: systemcheck.php Index: Makefile.in =================================================================== RCS file: /cvsroot/bobs/bobs/inc/servers/Makefile.in,v retrieving revision 1.4 retrieving revision 1.5 diff -u -d -r1.4 -r1.5 --- Makefile.in 20 Apr 2003 08:02:55 -0000 1.4 +++ Makefile.in 24 Apr 2003 06:15:59 -0000 1.5 @@ -81,6 +81,8 @@ myPASS = @myPASS@ myWEBDIR = @myWEBDIR@ myrealBOBSDATA = @myrealBOBSDATA@ +myrealCRONDIR = @myrealCRONDIR@ +myrealCRONTABDIR = @myrealCRONTABDIR@ myrealWEBDIR = @myrealWEBDIR@ htmldir = $(myWEBDIR)/inc/servers |
|
From: Joe Z. <jz...@us...> - 2003-04-24 06:16:07
|
Update of /cvsroot/bobs/bobs/winc In directory sc8-pr-cvs1:/tmp/cvs-serv31230/bobs/winc Modified Files: Makefile.in Log Message: Created a page to check bobs configuration: systemcheck.php Index: Makefile.in =================================================================== RCS file: /cvsroot/bobs/bobs/winc/Makefile.in,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- Makefile.in 20 Apr 2003 08:02:57 -0000 1.3 +++ Makefile.in 24 Apr 2003 06:16:00 -0000 1.4 @@ -81,6 +81,8 @@ myPASS = @myPASS@ myWEBDIR = @myWEBDIR@ myrealBOBSDATA = @myrealBOBSDATA@ +myrealCRONDIR = @myrealCRONDIR@ +myrealCRONTABDIR = @myrealCRONTABDIR@ myrealWEBDIR = @myrealWEBDIR@ htmldir = $(myWEBDIR)/winc |
|
From: Joe Z. <jz...@us...> - 2003-04-24 06:16:07
|
Update of /cvsroot/bobs/bobs/man In directory sc8-pr-cvs1:/tmp/cvs-serv31230/bobs/man Modified Files: Makefile.in Log Message: Created a page to check bobs configuration: systemcheck.php Index: Makefile.in =================================================================== RCS file: /cvsroot/bobs/bobs/man/Makefile.in,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- Makefile.in 20 Apr 2003 08:02:57 -0000 1.1 +++ Makefile.in 24 Apr 2003 06:16:00 -0000 1.2 @@ -81,6 +81,8 @@ myPASS = @myPASS@ myWEBDIR = @myWEBDIR@ myrealBOBSDATA = @myrealBOBSDATA@ +myrealCRONDIR = @myrealCRONDIR@ +myrealCRONTABDIR = @myrealCRONTABDIR@ myrealWEBDIR = @myrealWEBDIR@ man1_MANS = bobs.1 |
