--- doc/install/linux/install.pl	2011/04/24 01:25:13	1.9
+++ doc/install/linux/install.pl	2011/05/08 13:20:03	1.12
@@ -72,7 +72,7 @@ if (!open(LOG,">>loncapa_install.log"))
           &mt('Stopping execution.')."\n";
     exit;
 } else {
-    print LOG '$Id: install.pl,v 1.9 2011/04/24 01:25:13 raeburn Exp $'."\n";
+    print LOG '$Id: install.pl,v 1.12 2011/05/08 13:20:03 raeburn Exp $'."\n";
 }
 
 #
@@ -195,7 +195,7 @@ sub get_distro {
             $distro = 'centos'.$1;
             $updatecmd = 'yum install LONCAPA-prerequisites';
             $installnow = 'yum -y install LONCAPA-prerequisites';
-        } elsif ($versionstring =~ /Scientific Linux SL release ([\d.]+) /) {
+        } elsif ($versionstring =~ /Scientific Linux (SL )?release ([\d.]+) /) {
             my $ver = $1;
             $ver =~ s/\.\d+$//;
             $distro = 'scientific'.$ver;
@@ -219,7 +219,7 @@ sub get_distro {
             }
         } elsif ($versionstring =~ /^SuSE Linux ([\d\.]+) /i) {
             $distro = 'suse'.$1;
-            $updatecmd = 'yast -i LONCAPA-preprequisites';
+            $updatecmd = 'yast -i LONCAPA-prerequisites';
         } elsif ($versionstring =~ /^openSUSE ([\d\.]+) /i) {
             $distro = 'suse'.$1;
             if ($1 >= 10.3 ) {
@@ -425,21 +425,31 @@ sub check_mysql_running {
             print_and_log(&mt('MySQL is running.')."\n");
             return 1;
         } else {
-            system("/etc/rc.d/init.d/$mysqldaemon start"); 
+            system("/etc/init.d/$mysqldaemon start >/dev/null 2>&1 "); 
             print_and_log(&mt('Waiting for MySQL to start.')."\n");
             sleep 5;
-            if (open (PIPE, "/etc/init.d/$mysqldaemon 2>&1 |")) {
-                my $status = <PIPE>;
+            if (open(PIPE,"ps -ef |grep $process |grep -v grep 2>&1 |")) {
+                $status = <PIPE>;
                 close(PIPE);
                 chomp($status);
-                if ($status =~ /\(pid\s+\d\)/) {
+                if ($status =~ /^\Q$proc_owner\E\s+\d+\s+/) {
                     print_and_log(&mt('MySQL is running.')."\n");
                     return 1;
                 } else {
-                    print_and_log(&mt('Unable to start MySQL.')."\n"); 
+                    print_and_log(&mt('Still waiting for MySQL to start.')."\n");
+                    sleep 5;
+                    if (open(PIPE,"ps -ef |grep $process |grep -v grep 2>&1 |")) {
+                        $status = <PIPE>;
+                        close(PIPE);
+                        chomp($status);
+                        if ($status =~ /^\Q$proc_owner\E\s+\d+\s+/) {
+                            print_and_log(&mt('MySQL is running.')."\n");
+                            return 1;
+                        } else {
+                            print_and_log(&mt('Given up waiting for MySQL to start.')."\n"); 
+                        }
+                    }
                 }
-            } else {
-                print_and_log(&mt('Unable to start MySQL.')."\n");
             }
         }
     } else {
@@ -490,12 +500,12 @@ sub chkconfig {
     my $nrlstr = join('',@norunlevels);
     foreach my $type ('apache','mysql','ntp','cups','memcached') {
         my $service = $daemon{$type};
-        my $command = $checker_bin.' --list '.$service;
+        my $command = $checker_bin.' --list '.$service.' 2>/dev/null';
         if ($type eq 'cups') { 
             if ($distro =~ /^(?:debian|ubuntu)(\d+)/) {
                 my $version = $1;
                 if (($distro =~ /^ubuntu/) && ($version <= 8)) {
-                    $command = $checker_bin.' --list cupsys';
+                    $command = $checker_bin.' --list cupsys 2>/dev/null';
                 }
             }
         }
@@ -678,10 +688,20 @@ sub chksrvcs {
             chomp($daemonrunning);
             close(PIPE);
             if ($daemonrunning) {
-                $stopsrvcs{$service} = 1;
+                if ($service eq 'memcached') {
+                    my $cmd = '/usr/sbin/memcached';
+                    if ($distro =~ /^centos|fedora|scientific|rhes/) {
+                        $cmd = '/usr/bin/memcached';  
+                    } 
+                    unless ($daemonrunning =~ m{^www[^/]+\Q$cmd -m 400 -v\E$}) {
+                        $stopsrvcs{$service} = 1;
+                    }
+                } else {
+                    $stopsrvcs{$service} = 1;
+                }
             }
         }
-    } 
+    }
     return \%stopsrvcs;
 }
 
@@ -817,7 +837,8 @@ sub check_mysql_setup {
 
 sub check_mysql_wwwuser {
     my $mysql_wwwuser;
-    my $dbhn = DBI->connect("DBI:mysql:database=information_schema",'www','localhostkey');
+    my $dbhn = DBI->connect("DBI:mysql:database=information_schema",'www','localhostkey',
+                            {PrintError => +0}) || return;
     if ($dbhn) {
         $mysql_wwwuser = 1;
         $dbhn->disconnect;
@@ -1086,7 +1107,7 @@ if ($localecmd ne '') {
     exit;
 }
 if (!$gotprereqs) {
-    print "\n".&mt('The LONCAPA-prequisites package is not installed.')."\n".
+    print "\n".&mt('The LONCAPA-prerequisites package is not installed.')."\n".
           &mt('The following command can be used to install the package (and dependencies):')."\n\n".
           $updatecmd."\n\n";
     if ($installnow eq '') {
@@ -1100,7 +1121,7 @@ if (!$gotprereqs) {
                 close(PIPE);
                 $gotprereqs = &check_prerequisites($packagecmd,$distro);
                 if (!$gotprereqs) {
-                    print &mt('The LONCAPA-prequisites package is not installed.')."\n".
+                    print &mt('The LONCAPA-prerequisites package is not installed.')."\n".
                           &mt('Stopping execution.')."\n";
                     exit;
                 } else {
@@ -1110,7 +1131,7 @@ if (!$gotprereqs) {
                      &check_required($instdir,$dsn);
                 }
             } else {
-                print &mt('Failed to run command to install LONCAPA-prequisites')."\n";
+                print &mt('Failed to run command to install LONCAPA-prerequisites')."\n";
                 exit;
             }
         } else {
@@ -1258,7 +1279,9 @@ if ($callsub{'runlevels'}) {
             }  
         }
     }
-    &update_SuSEfirewall2_setup($instdir);
+    if ($distro =~ /^(suse|sles)/) {
+        &update_SuSEfirewall2_setup($instdir);
+    }
 } else {
     &print_and_log(&mt('Skipping setting override for start-up order of services.')."\n");
 }
@@ -1284,9 +1307,13 @@ if ($callsub{'firewall'}) {
                 }
             }
         }
+    } elsif ($distro =~ /^scientific/) {
+        print &mt('Use [_1] to configure the firewall to allow access for [_2].',
+                  'system-config-firewall-tui -- Customize',
+                  'ssh, http')."\n";
     } else {
         print &mt('Use [_1] to configure the firewall to allow access for [_2].',
-                  'setup -- Firewall confiuration -> Customize',
+                  'setup -- Firewall configuration -> Customize',
                   'ssh, http, https')."\n";
     }
 } else {
@@ -1296,7 +1323,7 @@ if ($callsub{'firewall'}) {
 if ($callsub{'stopsrvcs'}) {
     &kill_extra_services($distro,$recommended->{'stopsrvcs'});
 } else {
-    &print_and_log(&mt('Skipping stopping unnecessary service ([_1] daemon).',"'cups'")."\n");
+    &print_and_log(&mt('Skipping stopping unnecessary service ([_1] daemons).',"'cups','memcached'")."\n");
 }
 
 my ($have_tarball,$updateshown);
@@ -1449,7 +1476,7 @@ ENDPATCH
         ## Compile patched pwauth
         ##
         print_and_log(&mt('Compiling pwauth')."\n");
-        my $result = `cd $dir/; make`;
+        my $result = `cd $dir/; make 2>/dev/null `;
         my $expected = <<"END";
 gcc -g    -c -o pwauth.o pwauth.c
 gcc -o pwauth -g  pwauth.o -lcrypt
@@ -1498,16 +1525,24 @@ sub kill_extra_services {
                             if (($distro =~ /^ubuntu/) && ($version <= 8)) {
                                 $daemon = 'cupsys';
                             }
-                        } elsif ($distro =~ /^(?:suse|sles)/) {
+                        } else {
                             $daemon = 'cups';
                         }
                     }
-	            &print_and_log(`/etc/init.d/$daemon stop`);
+                    my $cmd = "ps -ef |grep '$daemon' |grep -v grep";
+                    if (open(PIPE,'-|',$cmd)) {
+                        my $daemonrunning = <PIPE>;
+                        chomp($daemonrunning);
+                        close(PIPE);
+                        if ($daemonrunning) {
+                            &print_and_log(`/etc/init.d/$daemon stop`);
+                        }
+                    }
 	            &print_and_log(&mt('Removing [_1] from startup.',$service)."\n");
                     if ($distro =~ /^(debian|ubuntu)/) {
                         &print_and_log(`update-rc.d -f $daemon remove`);
                     } else {
-	                &print_and_log(`chkconfig --del $service`);
+	                &print_and_log(`/sbin/chkconfig --del $service`);
                     }
                 }
             }
@@ -1658,7 +1693,7 @@ sub copy_httpd_conf {
     print_and_log(&mt('Copying the LON-CAPA [_1] to [_2].',"'httpd.conf'",
                   "'/etc/httpd/conf/httpd.conf'")."\n");
     copy "/etc/httpd/conf/httpd.conf","/etc/httpd/conf/httpd.conf.original";
-    copy "$instdir/httpd.conf","/etc/httpd/conf/httpd.conf";
+    copy "$instdir/centos-rhes-fedora-sl/httpd.conf","/etc/httpd/conf/httpd.conf";
     chmod(0444,"/etc/httpd/conf/httpd.conf");
     print_and_log("\n");
 }