sandweb-commit — CVS activity

[Sandweb-commit] CVS: sandweb/t/repository/sandbox info.txt,NONE,1.1

[Rob H. <for...@us...>]

Update of /cvsroot/sandweb/sandweb/t/repository/sandbox
In directory usw-pr-cvs1:/tmp/cvs-serv7007

Added Files:
	info.txt 
Log Message:
checking in file so this dir will be created

--- NEW FILE ---
This directory is for the Repository test

[Sandweb-commit] CVS: sandweb/t file.t,1.1,1.2

[Rob H. <for...@us...>]

Update of /cvsroot/sandweb/sandweb/t
In directory usw-pr-cvs1:/tmp/cvs-serv3724

Modified Files:
	file.t 
Log Message:
* now uses test.cfg instead of basics.cfg



Index: file.t
===================================================================
RCS file: /cvsroot/sandweb/sandweb/t/file.t,v
retrieving revision 1.1
retrieving revision 1.2
diff -U2 -r1.1 -r1.2
--- file.t	23 Mar 2002 19:47:59 -0000	1.1
+++ file.t	28 Mar 2002 03:30:05 -0000	1.2
@@ -15,5 +15,5 @@
 
 # prepare
-my $config_file = 'basics.cfg';
+my $config_file = 'test.cfg';
 my $config_dir = 't';
 

[Sandweb-commit] CVS: sandweb/t auth.t,NONE,1.1 test.cfg,NONE,1.1 basics.cfg,1.2,NONE basics.t,1.4,NONE

[Rob H. <for...@us...>]

Update of /cvsroot/sandweb/sandweb/t
In directory usw-pr-cvs1:/tmp/cvs-serv2703

Added Files:
	auth.t test.cfg 
Removed Files:
	basics.cfg basics.t 
Log Message:
* renamed basics.cfg to test.cfg

* renamed basics.t to auth.t



--- NEW FILE ---
use Test;
BEGIN { plan tests => 3, todo => [0] }

# test 1
eval { require SandWeb; return 1; };
ok($@, '');
croak() if $@; # if SandWeb didn't load. you gots problems

# prepare
my $config_file = 'test.cfg';
my $config_dir = 't';

# object creation, all objects global throughout CGI
my $return = SandWeb::->start_up( 
        config_dir => $config_dir, 
        config_file => $config_file,
);
# test 2
ok($return->{'errlev'});

my $auth = $return->{'data'}->{'auth'};

#use Data::Dumper;
#open(LOG, ">>/tmp/debug");
#print(LOG "--" . Dumper($auth));
#close LOG;

# test 3
ok($auth->login(
	'username' => 'foo',
	'password' => '023d22b9d93d1d31a0bbd69869a6ae2f',
	'salt' => '1477623659.97239',
));


--- NEW FILE ---
<!-- SandWeb XML Config File -->
<config>

	<!-- config tree for logging behavior -->
	<logging debug="0" 
		 log="0"
	/>

	<!-- config for paths to sandweb data files -->
	<paths	template_dir="../templates"
		data_dir="t/var/data"
		log_dir="t/var/log"
		work_dir="t/var/work"
		users_dir="t/var/users"
	/>

	<!-- config for cgi related information -->
	<cgi-bin cgi_path="/cgi-bin/sandweb/bin" 
		 cgi_domain=""
	/>

	<!-- cookie related settings (default values should work) -->
	<cookie cookie_path=""
		cookie_domain=""
	/> 
	
	<display bgcolor="blue"
		 text="black"
		 border="green"
	/>

	<webserver mime-types_location="/usr/local/apache/conf"
        	   mime-types_file="mime.types"
	/>

</config>

--- basics.cfg DELETED ---

--- basics.t DELETED ---

[Sandweb-commit] CVS: sandweb/tools instcgi.pl,1.5,1.6

[Nick J. <nje...@us...>]

Update of /cvsroot/sandweb/sandweb/tools
In directory usw-pr-cvs1:/tmp/cvs-serv5715

Modified Files:
	instcgi.pl 
Log Message:
* instcgi.pl will only ask to confirm cgi-dir if it does not already
  exist.


Index: instcgi.pl
===================================================================
RCS file: /cvsroot/sandweb/sandweb/tools/instcgi.pl,v
retrieving revision 1.5
retrieving revision 1.6
diff -U2 -r1.5 -r1.6
--- instcgi.pl	26 Mar 2002 06:16:39 -0000	1.5
+++ instcgi.pl	27 Mar 2002 18:54:21 -0000	1.6
@@ -8,16 +8,17 @@
 	my $cgidir = $_[0];
 
-	print("-------------------------\n");
-	print("Installing sandweb.cgi...\n\n");
-	print("Specify the location you wish to install the CGI script.\n");
-	print("This is commonly in your webservers 'cgi-bin' directory.\n");
-	print("Enter the full path [default: $cgidir] : ");
+	if (!-d $cgidir) {
+		print("-------------------------\n");
+		print("Installing sandweb.cgi...\n\n");
+		print("Specify the location you wish to install the CGI script.\n");
+		print("This is commonly in your webservers 'cgi-bin' directory.\n");
+		print("Enter the full path [default: $cgidir] : ");
 
-	my $tmp = '';
-	chomp($tmp = <STDIN>);
-	if ($tmp) {
-		$cgidir = $tmp;
+		my $tmp = '';
+		chomp($tmp = <STDIN>);
+		if ($tmp) {
+			$cgidir = $tmp;
+		}
 	}
-
 	print("Installing sandweb.cgi into $cgidir... ");
 	my $create = 1;

[Sandweb-commit] CVS: sandweb/tools install_script.pl,1.8,1.9

[Nick J. <nje...@us...>]

Update of /cvsroot/sandweb/sandweb/tools
In directory usw-pr-cvs1:/tmp/cvs-serv5256

Modified Files:
	install_script.pl 
Log Message:
* added logdir to variable output.
* default httpuser 'www'


Index: install_script.pl
===================================================================
RCS file: /cvsroot/sandweb/sandweb/tools/install_script.pl,v
retrieving revision 1.8
retrieving revision 1.9
diff -U2 -r1.8 -r1.9
--- install_script.pl	26 Mar 2002 08:10:22 -0000	1.8
+++ install_script.pl	27 Mar 2002 18:53:07 -0000	1.9
@@ -12,4 +12,5 @@
       "tmpldir  = $config::tmpldir\n".
       "cachedir = $config::cachedir\n".
+      "logdir   = $config::logdir\n".
       "httpuser = $config::httpuser\n";
 
@@ -19,5 +20,5 @@
 my $cachedir = $config::cachedir || '/var/cache/sandweb';
 my $logdir   = $config::logdir   || '/var/log/sandweb';
-my $httpuser = $config::httpuser || 'httpd';
+my $httpuser = $config::httpuser || 'www';
 
 # load functions

[Sandweb-commit] CVS: sandweb install.cfg,1.9,1.10

[Nick J. <nje...@us...>]

Update of /cvsroot/sandweb/sandweb
In directory usw-pr-cvs1:/tmp/cvs-serv4098

Modified Files:
	install.cfg 
Log Message:
* correcting previous commit which set cgidir to '/usr/www/cgi-bin'.
  this should be '/var/www/cgi-bin'.
* changed default httpuser to 'www'


Index: install.cfg
===================================================================
RCS file: /cvsroot/sandweb/sandweb/install.cfg,v
retrieving revision 1.9
retrieving revision 1.10
diff -U2 -r1.9 -r1.10
--- install.cfg	26 Mar 2002 08:11:52 -0000	1.9
+++ install.cfg	27 Mar 2002 18:50:22 -0000	1.10
@@ -3,8 +3,8 @@
 
 $cfgdir = '/usr/local/etc/sandweb';
-$cgidir = '/usr/www/cgi-bin';
+$cgidir = '/var/www/cgi-bin';
 $tmpldir = '/usr/local/lib/sandweb/templates';
 $cachedir = '/usr/local/share/sandweb';
-$httpuser = 'www-data';
+$httpuser = 'www';
 
 1;

[Sandweb-commit] CVS: sandweb Makefile.PL,1.10,1.11

[Nick J. <nje...@us...>]

Update of /cvsroot/sandweb/sandweb
In directory usw-pr-cvs1:/tmp/cvs-serv3139

Modified Files:
	Makefile.PL 
Log Message:
* Switching back to PREFIX (from SITEPREFIX) because SITEPREFIX does
  not always exist on all environment. PREFIX is a configurable setting
  though, and can be set in the Makefile.pl


Index: Makefile.PL
===================================================================
RCS file: /cvsroot/sandweb/sandweb/Makefile.PL,v
retrieving revision 1.10
retrieving revision 1.11
diff -U2 -r1.10 -r1.11
--- Makefile.PL	26 Mar 2002 07:16:13 -0000	1.10
+++ Makefile.PL	27 Mar 2002 18:47:57 -0000	1.11
@@ -23,4 +23,5 @@
 
 	EXE_FILES => [ 'bin/sandweb-admin', ],
+	PREFIX => "/usr/local",
 );
 
@@ -30,5 +31,5 @@
 '
 custom_install:
-	./tools/install_script.pl $(SITEPREFIX)
+	./tools/install_script.pl $(PREFIX)
 ';
 }

[Sandweb-commit] CVS: sandweb/etc sandweb.cfg,1.19,1.20

[Rob H. <for...@us...>]

Update of /cvsroot/sandweb/sandweb/etc
In directory usw-pr-cvs1:/tmp/cvs-serv26533/etc

Modified Files:
	sandweb.cfg 
Log Message:
/cgi-bin is a more reasonable default cgi path.



Index: sandweb.cfg
===================================================================
RCS file: /cvsroot/sandweb/sandweb/etc/sandweb.cfg,v
retrieving revision 1.19
retrieving revision 1.20
diff -U2 -r1.19 -r1.20
--- sandweb.cfg	26 Mar 2002 06:56:14 -0000	1.19
+++ sandweb.cfg	26 Mar 2002 08:12:43 -0000	1.20
@@ -15,5 +15,5 @@
 
 	<!-- config for cgi related information -->
-	<cgi-bin cgi_path="/cgi-bin/sandweb/bin" 
+	<cgi-bin cgi_path="/cgi-bin" 
 		 cgi_domain=""
 	/>

[Sandweb-commit] CVS: sandweb install.cfg,1.8,1.9

[Rob H. <for...@us...>]

Update of /cvsroot/sandweb/sandweb
In directory usw-pr-cvs1:/tmp/cvs-serv26362

Modified Files:
	install.cfg 
Log Message:
oops, one of the changes I made before broke the build, then I accidently
checked this and the fix in w/ no log message! :)

everything should work now.



Index: install.cfg
===================================================================
RCS file: /cvsroot/sandweb/sandweb/install.cfg,v
retrieving revision 1.8
retrieving revision 1.9
diff -U2 -r1.8 -r1.9
--- install.cfg	26 Mar 2002 08:10:22 -0000	1.8
+++ install.cfg	26 Mar 2002 08:11:52 -0000	1.9
@@ -3,5 +3,5 @@
 
 $cfgdir = '/usr/local/etc/sandweb';
-$cgidir = '/usr/lib/cgi-bin';
+$cgidir = '/usr/www/cgi-bin';
 $tmpldir = '/usr/local/lib/sandweb/templates';
 $cachedir = '/usr/local/share/sandweb';

[Sandweb-commit] CVS: sandweb/tools install_script.pl,1.7,1.8

[Rob H. <for...@us...>]

Update of /cvsroot/sandweb/sandweb/tools
In directory usw-pr-cvs1:/tmp/cvs-serv26130/tools

Modified Files:
	install_script.pl 
Log Message:




Index: install_script.pl
===================================================================
RCS file: /cvsroot/sandweb/sandweb/tools/install_script.pl,v
retrieving revision 1.7
retrieving revision 1.8
diff -U2 -r1.7 -r1.8
--- install_script.pl	26 Mar 2002 07:05:34 -0000	1.7
+++ install_script.pl	26 Mar 2002 08:10:22 -0000	1.8
@@ -72,5 +72,5 @@
 # updating config file
 system('tools/change-entry.pl', "$cfgdir/sandweb.cfg", 'template_dir="../templates"', "template_dir=\"$tmpldir\"");
-system('tools/change-entry.pl', "$cfgdir/sandweb.cfg", 'log_dir="../var/log"', "users_dir=\"$cachedir/log\"");
+system('tools/change-entry.pl', "$cfgdir/sandweb.cfg", 'log_dir="../var/log"', "log_dir=\"$logdir\"");
 system('tools/change-entry.pl', "$cfgdir/sandweb.cfg", 'data_dir="../var/data"', "data_dir=\"$cachedir/data\"");
 system('tools/change-entry.pl', "$cfgdir/sandweb.cfg", 'users_dir="../var/users"', "users_dir=\"$cachedir/users\"");

[Sandweb-commit] CVS: sandweb install.cfg,1.7,1.8

[Rob H. <for...@us...>]

Update of /cvsroot/sandweb/sandweb
In directory usw-pr-cvs1:/tmp/cvs-serv26130

Modified Files:
	install.cfg 
Log Message:




Index: install.cfg
===================================================================
RCS file: /cvsroot/sandweb/sandweb/install.cfg,v
retrieving revision 1.7
retrieving revision 1.8
diff -U2 -r1.7 -r1.8
--- install.cfg	26 Mar 2002 07:12:56 -0000	1.7
+++ install.cfg	26 Mar 2002 08:10:22 -0000	1.8
@@ -3,5 +3,5 @@
 
 $cfgdir = '/usr/local/etc/sandweb';
-$cgidir = '/usr/www/cgi-bin';
+$cgidir = '/usr/lib/cgi-bin';
 $tmpldir = '/usr/local/lib/sandweb/templates';
 $cachedir = '/usr/local/share/sandweb';

[Sandweb-commit] CVS: sandweb Makefile.PL,1.9,1.10

[Rob H. <for...@us...>]

Update of /cvsroot/sandweb/sandweb
In directory usw-pr-cvs1:/tmp/cvs-serv15882

Modified Files:
	Makefile.PL 
Log Message:
* we should use SITEPREFIX, not PREFIX, so it'll be /usr/local.



Index: Makefile.PL
===================================================================
RCS file: /cvsroot/sandweb/sandweb/Makefile.PL,v
retrieving revision 1.9
retrieving revision 1.10
diff -U2 -r1.9 -r1.10
--- Makefile.PL	25 Mar 2002 08:13:35 -0000	1.9
+++ Makefile.PL	26 Mar 2002 07:16:13 -0000	1.10
@@ -30,5 +30,5 @@
 '
 custom_install:
-	./tools/install_script.pl $(PREFIX)
+	./tools/install_script.pl $(SITEPREFIX)
 ';
 }

[Sandweb-commit] CVS: sandweb install.cfg,1.6,1.7

[Rob H. <for...@us...>]

Update of /cvsroot/sandweb/sandweb
In directory usw-pr-cvs1:/tmp/cvs-serv15353

Modified Files:
	install.cfg 
Log Message:
changing default cgidir back

Index: install.cfg
===================================================================
RCS file: /cvsroot/sandweb/sandweb/install.cfg,v
retrieving revision 1.6
retrieving revision 1.7
diff -U2 -r1.6 -r1.7
--- install.cfg	26 Mar 2002 06:56:14 -0000	1.6
+++ install.cfg	26 Mar 2002 07:12:56 -0000	1.7
@@ -3,5 +3,5 @@
 
 $cfgdir = '/usr/local/etc/sandweb';
-$cgidir = '/usr/lib/cgi-bin';
+$cgidir = '/usr/www/cgi-bin';
 $tmpldir = '/usr/local/lib/sandweb/templates';
 $cachedir = '/usr/local/share/sandweb';

[Sandweb-commit] CVS: sandweb/tools install_script.pl,1.6,1.7

[Rob H. <for...@us...>]

Update of /cvsroot/sandweb/sandweb/tools
In directory usw-pr-cvs1:/tmp/cvs-serv14161/tools

Modified Files:
	install_script.pl 
Log Message:
added creation of $logdir, owned by apache user



Index: install_script.pl
===================================================================
RCS file: /cvsroot/sandweb/sandweb/tools/install_script.pl,v
retrieving revision 1.6
retrieving revision 1.7
diff -U2 -r1.6 -r1.7
--- install_script.pl	26 Mar 2002 06:56:14 -0000	1.6
+++ install_script.pl	26 Mar 2002 07:05:34 -0000	1.7
@@ -18,4 +18,5 @@
 my $tmpldir  = $config::tmpldir  || "$PREFIX/lib/sandweb/templates";
 my $cachedir = $config::cachedir || '/var/cache/sandweb';
+my $logdir   = $config::logdir   || '/var/log/sandweb';
 my $httpuser = $config::httpuser || 'httpd';
 
@@ -52,4 +53,10 @@
 	exit(6);
 }
+
+# create log dir
+print "Creating SandWeb log dir : $logdir/\n";
+system('tools/mkdirto.pl', '755', '0:0', $logdir);
+my $httpuser_uid = &getuid($httpuser);
+chown($httpuser_uid, 0, "$logdir");
 
 # install config file

[Sandweb-commit] CVS: sandweb/etc sandweb.cfg,1.18,1.19

[Rob H. <for...@us...>]

Update of /cvsroot/sandweb/sandweb/etc
In directory usw-pr-cvs1:/tmp/cvs-serv12183/etc

Modified Files:
	sandweb.cfg 
Log Message:
* corrected typo that prevented users_dir from being set in sandweb.cfg

* install_script now installs repository.cfg and user.cfg



Index: sandweb.cfg
===================================================================
RCS file: /cvsroot/sandweb/sandweb/etc/sandweb.cfg,v
retrieving revision 1.18
retrieving revision 1.19
diff -U2 -r1.18 -r1.19
--- sandweb.cfg	22 Mar 2002 21:59:47 -0000	1.18
+++ sandweb.cfg	26 Mar 2002 06:56:14 -0000	1.19
@@ -11,5 +11,4 @@
 		data_dir="../var/data"
 		log_dir="../var/log"
-		work_dir="../var/work"
 		users_dir="../var/users"
 	/>

[Sandweb-commit] CVS: sandweb/tools install_script.pl,1.5,1.6

[Rob H. <for...@us...>]

Update of /cvsroot/sandweb/sandweb/tools
In directory usw-pr-cvs1:/tmp/cvs-serv12183/tools

Modified Files:
	install_script.pl 
Log Message:
* corrected typo that prevented users_dir from being set in sandweb.cfg

* install_script now installs repository.cfg and user.cfg



Index: install_script.pl
===================================================================
RCS file: /cvsroot/sandweb/sandweb/tools/install_script.pl,v
retrieving revision 1.5
retrieving revision 1.6
diff -U2 -r1.5 -r1.6
--- install_script.pl	26 Mar 2002 06:16:39 -0000	1.5
+++ install_script.pl	26 Mar 2002 06:56:14 -0000	1.6
@@ -49,5 +49,5 @@
 	chown($httpuser_uid, 0, "$PREFIX/bin/sandweb-admin");
 } else {
-	print "unable to local $PREFIX/bin/sandweb-admin\n";
+	print "unable to locate $PREFIX/bin/sandweb-admin\n";
 	exit(6);
 }
@@ -57,10 +57,15 @@
 system('tools/mkdirto.pl', '755', '0:0', $cfgdir);
 system('cp', 'etc/sandweb.cfg', "$cfgdir/sandweb.cfg");
+system('cp', 'etc/repository.cfg', "$cfgdir/repository.cfg");
+system('cp', 'etc/user.cfg', "$cfgdir/user.cfg");
 chown(0, 0, "$cfgdir/sandweb.cfg");
+chown(0, 0, "$cfgdir/repository.cfg");
+chown(0, 0, "$cfgdir/user.cfg");
 
 # updating config file
 system('tools/change-entry.pl', "$cfgdir/sandweb.cfg", 'template_dir="../templates"', "template_dir=\"$tmpldir\"");
+system('tools/change-entry.pl', "$cfgdir/sandweb.cfg", 'log_dir="../var/log"', "users_dir=\"$cachedir/log\"");
 system('tools/change-entry.pl', "$cfgdir/sandweb.cfg", 'data_dir="../var/data"', "data_dir=\"$cachedir/data\"");
-system('tools/change-entry.pl', "$cfgdir/sandweb.cfg", 'user_dir="../var/users"', "users_dir=\"$cachedir/users\"");
+system('tools/change-entry.pl', "$cfgdir/sandweb.cfg", 'users_dir="../var/users"', "users_dir=\"$cachedir/users\"");
 
 # updating config path in executables

[Sandweb-commit] CVS: sandweb install.cfg,1.5,1.6

[Rob H. <for...@us...>]

Update of /cvsroot/sandweb/sandweb
In directory usw-pr-cvs1:/tmp/cvs-serv12183

Modified Files:
	install.cfg 
Log Message:
* corrected typo that prevented users_dir from being set in sandweb.cfg

* install_script now installs repository.cfg and user.cfg



Index: install.cfg
===================================================================
RCS file: /cvsroot/sandweb/sandweb/install.cfg,v
retrieving revision 1.5
retrieving revision 1.6
diff -U2 -r1.5 -r1.6
--- install.cfg	26 Mar 2002 06:39:35 -0000	1.5
+++ install.cfg	26 Mar 2002 06:56:14 -0000	1.6
@@ -1,11 +1,10 @@
-# Installation configuration variables.
+# Installation configureation variables.
 package config;
 
 $cfgdir = '/usr/local/etc/sandweb';
-$cgidir = '/var/www/cgi-bin';
+$cgidir = '/usr/lib/cgi-bin';
 $tmpldir = '/usr/local/lib/sandweb/templates';
 $cachedir = '/usr/local/share/sandweb';
 $httpuser = 'www-data';
-
 
 1;

[Sandweb-commit] CVS: sandweb install.cfg,1.4,1.5

[Rob H. <for...@us...>]

Update of /cvsroot/sandweb/sandweb
In directory usw-pr-cvs1:/tmp/cvs-serv8767

Modified Files:
	install.cfg 
Log Message:
oops, didn't mean to check in the version from my Solaris box :P
just wanted to change cfgdir, done.



Index: install.cfg
===================================================================
RCS file: /cvsroot/sandweb/sandweb/install.cfg,v
retrieving revision 1.4
retrieving revision 1.5
diff -U2 -r1.4 -r1.5
--- install.cfg	26 Mar 2002 06:27:40 -0000	1.4
+++ install.cfg	26 Mar 2002 06:39:35 -0000	1.5
@@ -1,10 +1,11 @@
-# Installation configureation variables.
+# Installation configuration variables.
 package config;
 
 $cfgdir = '/usr/local/etc/sandweb';
-$cgidir = '/usr/local/apache/cgi-bin';
+$cgidir = '/var/www/cgi-bin';
 $tmpldir = '/usr/local/lib/sandweb/templates';
 $cachedir = '/usr/local/share/sandweb';
-$httpuser = 'nobody';
+$httpuser = 'www-data';
+
 
 1;

[Sandweb-commit] CVS: sandweb/tools instcachedir.pl,1.4,1.5

[Rob H. <for...@us...>]

Update of /cvsroot/sandweb/sandweb/tools
In directory usw-pr-cvs1:/tmp/cvs-serv6599/tools

Modified Files:
	instcachedir.pl 
Log Message:
* suggest "nobody" instead of "root" as an apache user ;) I think it's
  way more likely, what reason is there to run apache as root?

* changed default cfgdir to /usr/local/etc/sandweb, since we have more
  than one config file they are easier to find this way.


Index: instcachedir.pl
===================================================================
RCS file: /cvsroot/sandweb/sandweb/tools/instcachedir.pl,v
retrieving revision 1.4
retrieving revision 1.5
diff -U2 -r1.4 -r1.5
--- instcachedir.pl	25 Mar 2002 23:14:19 -0000	1.4
+++ instcachedir.pl	26 Mar 2002 06:27:40 -0000	1.5
@@ -27,5 +27,5 @@
 		print("have read/write access to the '$cachedir' directory. Please\n");
 		print("enter the username the webserver runs as (some common users are:\n");
-		print("httpd, apache, www-data, or even root). [default: $httpuser]: ");
+		print("httpd, apache, www-data, nobody ). [default: $httpuser]: ");
 		my $tmp = '';
 		chomp($tmp = <STDIN>);

[Sandweb-commit] CVS: sandweb install.cfg,1.3,1.4

[Rob H. <for...@us...>]

Update of /cvsroot/sandweb/sandweb
In directory usw-pr-cvs1:/tmp/cvs-serv6599

Modified Files:
	install.cfg 
Log Message:
* suggest "nobody" instead of "root" as an apache user ;) I think it's
  way more likely, what reason is there to run apache as root?

* changed default cfgdir to /usr/local/etc/sandweb, since we have more
  than one config file they are easier to find this way.


Index: install.cfg
===================================================================
RCS file: /cvsroot/sandweb/sandweb/install.cfg,v
retrieving revision 1.3
retrieving revision 1.4
diff -U2 -r1.3 -r1.4
--- install.cfg	25 Mar 2002 23:15:25 -0000	1.3
+++ install.cfg	26 Mar 2002 06:27:40 -0000	1.4
@@ -1,11 +1,10 @@
-# Installation configuration variables.
+# Installation configureation variables.
 package config;
 
-$cfgdir = '/usr/local/etc';
-$cgidir = '/var/www/cgi-bin';
+$cfgdir = '/usr/local/etc/sandweb';
+$cgidir = '/usr/local/apache/cgi-bin';
 $tmpldir = '/usr/local/lib/sandweb/templates';
 $cachedir = '/usr/local/share/sandweb';
-$httpuser = 'www-data';
-
+$httpuser = 'nobody';
 
 1;

[Sandweb-commit] CVS: sandweb/tools install_script.pl,1.4,1.5 instcgi.pl,1.4,1.5

[Rob H. <for...@us...>]

Update of /cvsroot/sandweb/sandweb/tools
In directory usw-pr-cvs1:/tmp/cvs-serv4416/tools

Modified Files:
	install_script.pl instcgi.pl 
Log Message:
fixed perm settings, they are now in install_script.pl


Index: install_script.pl
===================================================================
RCS file: /cvsroot/sandweb/sandweb/tools/install_script.pl,v
retrieving revision 1.4
retrieving revision 1.5
diff -U2 -r1.4 -r1.5
--- install_script.pl	26 Mar 2002 01:29:08 -0000	1.4
+++ install_script.pl	26 Mar 2002 06:16:39 -0000	1.5
@@ -47,7 +47,4 @@
 	}
 	print "Setting ownership of $PREFIX/bin/sandweb-admin to: $httpuser_uid:0\n";
-	# XXX - Why don't any of these methods work? (Set the SUID bit?)
-	#chmod(0770, "$PREFIX/bin/sandweb-admin");
-	#system("chmod", "u=rwx,g=rwxs,o=", "$PREFIX/bin/sandweb-admin");
 	chown($httpuser_uid, 0, "$PREFIX/bin/sandweb-admin");
 } else {
@@ -75,4 +72,13 @@
 print "sandweb-admin\n";
 
+# set execute permissions for scripts 
+
+chmod(0775, "$cgidir/sandweb.cgi");
+chmod(0775, "$PREFIX/bin/sandweb-admin");
+
+# setguid for sandweb-admin
+
+system("chmod", "g+s", "$PREFIX/bin/sandweb-admin");
+
 # save install config to install.cfg for future reference.
 print "Saving configuration...\n";
@@ -91,9 +97,4 @@
 print "Installation complete!\n";
 print "----------------------\n";
-print "Please execute this command prior to using the 'sandweb-admin' tool.\n";
-print "It must have it's SUID but set to maintain the correct permissions.\n";
-print "\n   chmod u=rwx,g=rwxs,o= $PREFIX/bin/sandweb-admin\n\n";
-print "In order to execute the CGI, please run the following command:\n\n";
-print "     chmod u=rwx,g=rx,o=rx $cgidir/sandweb.cgi\n\n";
 exit(0);
 

Index: instcgi.pl
===================================================================
RCS file: /cvsroot/sandweb/sandweb/tools/instcgi.pl,v
retrieving revision 1.4
retrieving revision 1.5
diff -U2 -r1.4 -r1.5
--- instcgi.pl	26 Mar 2002 01:27:29 -0000	1.4
+++ instcgi.pl	26 Mar 2002 06:16:39 -0000	1.5
@@ -36,6 +36,4 @@
 		return(0);
 	} else {
-		# XXX - why isn't this working??
-		#chmod(755, "$cgidir/sandweb.cgi");
 		print("done.\n");
 		return($cgidir);

[Sandweb-commit] CVS: sandweb/bin sandweb-admin,1.12,1.13

[Nick J. <nje...@us...>]

Update of /cvsroot/sandweb/sandweb/bin
In directory usw-pr-cvs1:/tmp/cvs-serv11045/bin

Modified Files:
	sandweb-admin 
Log Message:
* better error checking


Index: sandweb-admin
===================================================================
RCS file: /cvsroot/sandweb/sandweb/bin/sandweb-admin,v
retrieving revision 1.12
retrieving revision 1.13
diff -U2 -r1.12 -r1.13
--- sandweb-admin	24 Mar 2002 07:03:59 -0000	1.12
+++ sandweb-admin	26 Mar 2002 01:29:51 -0000	1.13
@@ -40,4 +40,5 @@
 use SandWeb;
 use Digest::MD5 qw(md5_hex);
+use Data::Dumper;
 
 # changeable global vars
@@ -57,7 +58,7 @@
 if (!$return->{'errlev'}) {
         # error loading config file
-        print("unable to open config file: $config_file in dir '$config_dir'");
+        print("unable to open config file: $config_dir/$config_file\n");
         print("return data: <pre>" . Dumper($return) . "</pre>");
-        exit(0);        
+        exit(1);
 }
 

[Sandweb-commit] CVS: sandweb/tools install_script.pl,1.3,1.4

[Nick J. <nje...@us...>]

Update of /cvsroot/sandweb/sandweb/tools
In directory usw-pr-cvs1:/tmp/cvs-serv10500/tools

Modified Files:
	install_script.pl 
Log Message:
* install script near completion
  - sandweb.cfg now installs
  - sandweb.cfg config vars are updated
  - sandweb-admin is installed and owned. perms must be set by user though.
    (see XXX in install_config.pl)
  - sandweb.cgi config path updated to sandweb.cfg location
  - sandweb-admin config path updated to sandweb.cfg locatin


Index: install_script.pl
===================================================================
RCS file: /cvsroot/sandweb/sandweb/tools/install_script.pl,v
retrieving revision 1.3
retrieving revision 1.4
diff -U2 -r1.3 -r1.4
--- install_script.pl	26 Mar 2002 00:47:40 -0000	1.3
+++ install_script.pl	26 Mar 2002 01:29:08 -0000	1.4
@@ -8,5 +8,4 @@
 require 'install.cfg'; # load config
 
-use Data::Dumper;
 print "\ncfgdir   = $config::cfgdir\n".
       "cgidir   = $config::cgidir\n".
@@ -15,5 +14,4 @@
       "httpuser = $config::httpuser\n";
 
-#print Dumper($config::cgidir, $config::tmpldir, $config::cachedir, $config::httpuser);
 my $cfgdir   = $config::cfgdir   || '/usr/local/etc';
 my $cgidir   = $config::cgidir   || '/var/www/cgi-bin';
@@ -49,8 +47,7 @@
 	}
 	print "Setting ownership of $PREFIX/bin/sandweb-admin to: $httpuser_uid:0\n";
-	#print "Setting permissions on $PREFIX/bin/sandweb-admin to: (u=rwx,g=rwxs,o=) $httpuser_uid:0...\n";
+	# XXX - Why don't any of these methods work? (Set the SUID bit?)
 	#chmod(0770, "$PREFIX/bin/sandweb-admin");
 	#system("chmod", "u=rwx,g=rwxs,o=", "$PREFIX/bin/sandweb-admin");
-	#`chmod u=rwx,g=rwxs,o= $PREFIX/bin/sandweb-admin`;
 	chown($httpuser_uid, 0, "$PREFIX/bin/sandweb-admin");
 } else {
@@ -59,4 +56,22 @@
 }
 
+# install config file
+print "Installing SandWeb config file in $cfgdir\n";
+system('tools/mkdirto.pl', '755', '0:0', $cfgdir);
+system('cp', 'etc/sandweb.cfg', "$cfgdir/sandweb.cfg");
+chown(0, 0, "$cfgdir/sandweb.cfg");
+
+# updating config file
+system('tools/change-entry.pl', "$cfgdir/sandweb.cfg", 'template_dir="../templates"', "template_dir=\"$tmpldir\"");
+system('tools/change-entry.pl', "$cfgdir/sandweb.cfg", 'data_dir="../var/data"', "data_dir=\"$cachedir/data\"");
+system('tools/change-entry.pl', "$cfgdir/sandweb.cfg", 'user_dir="../var/users"', "users_dir=\"$cachedir/users\"");
+
+# updating config path in executables
+print "Updating config file paths in executables... "; 
+system('tools/change-entry.pl', "$cgidir/sandweb.cgi", "config_dir = '../etc'", 
+"config_dir = '$cfgdir'");
+print "sandweb.cgi, ";
+system('tools/change-entry.pl', "$PREFIX/bin/sandweb-admin", "config_dir = '../etc'", "config_dir = '$cfgdir'");
+print "sandweb-admin\n";
 
 # save install config to install.cfg for future reference.
@@ -79,4 +94,6 @@
 print "It must have it's SUID but set to maintain the correct permissions.\n";
 print "\n   chmod u=rwx,g=rwxs,o= $PREFIX/bin/sandweb-admin\n\n";
+print "In order to execute the CGI, please run the following command:\n\n";
+print "     chmod u=rwx,g=rx,o=rx $cgidir/sandweb.cgi\n\n";
 exit(0);
 

[Sandweb-commit] CVS: sandweb/tools instcgi.pl,1.3,1.4

[Nick J. <nje...@us...>]

Update of /cvsroot/sandweb/sandweb/tools
In directory usw-pr-cvs1:/tmp/cvs-serv10419/tools

Modified Files:
	instcgi.pl 
Log Message:
* can't figure out how to set executable perms on CGI. chmod not working.


Index: instcgi.pl
===================================================================
RCS file: /cvsroot/sandweb/sandweb/tools/instcgi.pl,v
retrieving revision 1.3
retrieving revision 1.4
diff -U2 -r1.3 -r1.4
--- instcgi.pl	25 Mar 2002 08:12:39 -0000	1.3
+++ instcgi.pl	26 Mar 2002 01:27:29 -0000	1.4
@@ -36,4 +36,6 @@
 		return(0);
 	} else {
+		# XXX - why isn't this working??
+		#chmod(755, "$cgidir/sandweb.cgi");
 		print("done.\n");
 		return($cgidir);

[Sandweb-commit] CVS: sandweb/tools install_script.pl,1.2,1.3

[Nick J. <nje...@us...>]

Update of /cvsroot/sandweb/sandweb/tools
In directory usw-pr-cvs1:/tmp/cvs-serv32470

Modified Files:
	install_script.pl 
Log Message:
* install_script now sets perms on sandweb-admin, except I can't figure
  out what chmod g=rwxs doesn't work through the perl script, perhaps
  security? dunno, for now when its done it just says "please enter this"
  chmod u=rwx,g=rwxs,o= $PREFIX/bin/sandweb-admin


Index: install_script.pl
===================================================================
RCS file: /cvsroot/sandweb/sandweb/tools/install_script.pl,v
retrieving revision 1.2
retrieving revision 1.3
diff -U2 -r1.2 -r1.3
--- install_script.pl	25 Mar 2002 23:26:05 -0000	1.2
+++ install_script.pl	26 Mar 2002 00:47:40 -0000	1.3
@@ -41,4 +41,21 @@
 } else { exit(4); }
 
+# set permissions on installed sandweb-admin
+if (-f "$PREFIX/bin/sandweb-admin") {
+	my $httpuser_uid = &getuid($httpuser);
+	if ($httpuser_uid == -1) {
+		print "Unable to get UID of $httpuser\n";
+		exit(5);
+	}
+	print "Setting ownership of $PREFIX/bin/sandweb-admin to: $httpuser_uid:0\n";
+	#print "Setting permissions on $PREFIX/bin/sandweb-admin to: (u=rwx,g=rwxs,o=) $httpuser_uid:0...\n";
+	#chmod(0770, "$PREFIX/bin/sandweb-admin");
+	#system("chmod", "u=rwx,g=rwxs,o=", "$PREFIX/bin/sandweb-admin");
+	#`chmod u=rwx,g=rwxs,o= $PREFIX/bin/sandweb-admin`;
+	chown($httpuser_uid, 0, "$PREFIX/bin/sandweb-admin");
+} else {
+	print "unable to local $PREFIX/bin/sandweb-admin\n";
+	exit(6);
+}
 
 
@@ -56,3 +73,23 @@
 close CFG;
 
+print "----------------------\n";
 print "Installation complete!\n";
+print "----------------------\n";
+print "Please execute this command prior to using the 'sandweb-admin' tool.\n";
+print "It must have it's SUID but set to maintain the correct permissions.\n";
+print "\n   chmod u=rwx,g=rwxs,o= $PREFIX/bin/sandweb-admin\n\n";
+exit(0);
+
+sub getuid($) {
+	my $user = shift;
+	my ($junk, $junk2, $junk3);
+	my $uid = -1;
+	open (PW, "</etc/passwd") or die "Unable to read password file\n";
+	foreach my $line (<PW>) {
+		if ($line =~ /^$user\:/) {
+			($junk, $junk2, $uid, $junk3) = split(':', $line, 4); 
+		}
+	}
+	close PW;
+	return $uid;
+}