--- doc/install/fedora/install.pl	2003/12/12 22:06:08	1.3
+++ doc/install/fedora/install.pl	2005/03/24 21:42:46	1.7
@@ -2,7 +2,7 @@
 # The LearningOnline Network 
 # Fedora installation script
 #
-# $Id: install.pl,v 1.3 2003/12/12 22:06:08 matthew Exp $
+# $Id: install.pl,v 1.7 2005/03/24 21:42:46 matthew Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -35,7 +35,7 @@ my $test;
 # note: The filehandle LOG is global.
 open LOG,">>loncapa_install.log" || die "Unable to open log file.\n";
 
-print LOG '$Id: install.pl,v 1.3 2003/12/12 22:06:08 matthew Exp $'."\n";
+print LOG '$Id: install.pl,v 1.7 2005/03/24 21:42:46 matthew Exp $'."\n";
 
 # Some friendly subroutines
 sub die_if_nonempty {
@@ -180,7 +180,7 @@ if ($install_httpd_conf) {
 }
 
 #my $lctarball = 'loncapa-current.tar.gz';
-my $lctarball = 'loncapa-fedora-1.0.99.2.tar.gz';
+my $lctarball = 'loncapa-fedora-current.tar.gz';
 if ($download_loncapa) {
     &download_loncapa($lctarball);
 } else {
@@ -218,14 +218,7 @@ sub setup_www {
 ###############################################
 ###############################################
 sub uid_of_www {
-    my $num = `grep ^www /etc/passwd | cut -d':' -f3`;
-    chomp $num;
-    if (int($num) == $num) {
-	writelog ("uid of www = $num\n");
-    } else {
-	die "Unable to determine UID of user www\n  Halting.\n";
-    }
-    print_and_log("\n");
+    my ($num) = (getpwnam('www'))[2];
     return $num;
 }
 
@@ -334,8 +327,7 @@ END
 	$mysql_commands .= <<"END";
 INSERT INTO user (Host, User, Password)
 VALUES ('localhost','www',password('localhostkey'));
-INSERT INTO db VALUES ('localhost','loncapa','www',
-'Y','Y','Y','Y','Y','Y','N','Y','Y','Y');
+INSERT INTO db (Host,Db,User,Select_priv,Insert_priv,Update_priv,Delete_priv,Create_priv,Drop_priv,Grant_priv,References_priv,Index_priv,Alter_priv) VALUES ('localhost','loncapa','www','Y','Y','Y','Y','Y','Y','N','Y','Y','Y');
 SET PASSWORD FOR root\@localhost=PASSWORD('$rootpass');
 DELETE FROM user WHERE host<>'localhost';
 FLUSH PRIVILEGES;
@@ -400,7 +392,7 @@ You seem to have a version of loncapa-cu
 This copy will be used and a new version will NOT be downloaded.  
 If you wish, you may download a new version by executing:
 
-wget http://install.loncapa.org/versions/loncapa-current.tar.gz
+wget http://install.loncapa.org/versions/loncapa-fedora-current.tar.gz
 
 ------------------------------------------------------------------------
 END