--- doc/loncapafiles/rpmcheck.piml	2004/05/19 16:31:07	1.1
+++ doc/loncapafiles/rpmcheck.piml	2004/05/19 16:45:20	1.2
@@ -3,7 +3,7 @@
 <!-- phpcheck.piml -->
 <!-- Matthew Hall -->
 
-<!-- $Id: rpmcheck.piml,v 1.1 2004/05/19 16:31:07 matthew Exp $ -->
+<!-- $Id: rpmcheck.piml,v 1.2 2004/05/19 16:45:20 matthew Exp $ -->
 
 <!--
 
@@ -35,6 +35,8 @@ http://www.lon-capa.org/
 <file>
 <target dist="default">/home/httpd/lonUsers</target>
 <perlscript mode="fg">
+#
+# Look for php packages that should not be installed
 my @phprpms = `rpm -q -a|grep php`;
 if (@phprpms) {
     print "WARNING: PHP packages are present on this system.\n".
@@ -47,9 +49,10 @@ if (@phprpms) {
     }
     print "\n";
 }
+#
+# Look for mod_* that are thought to conflict with LON-CAPA
 my @mod_rpms = `rpm -q -a | grep mod`;
 foreach my $rpm (@mod_rpms) {
-#    next if ($rpm =~ /^mod_perl/);
     if ($rpm =~ /mod_bandwidth/) {
         print "WARNING: it appears you have the mod_bandwidth ".
         "package installed.\n".
@@ -57,7 +60,7 @@ foreach my $rpm (@mod_rpms) {
         "Use the following command to remove it:\n".
         "rpm -e $rpm\n";
     }
-    if ($rpm =~ /throttle/) {
+    if ($rpm =~ /mod_throttle/) {
         print "WARNING: it appears you have the mod_throttle ".
         "package installed.\n".
         "mod_throttle appears to conflict with LON-CAPA.\n".
@@ -66,6 +69,21 @@ foreach my $rpm (@mod_rpms) {
     }
         
 }
+#
+# Look for packages which we need to be present
+foreach my $rpm ('psutils') {
+    my @RPMs = `rpm -q -a | grep $rpm`;
+    if (! @RPMs) {
+        print "WARNING: ".$rpm." does not appear to be installed.\n";
+    }
+}
+#
+# Look for files which we need to be present
+foreach my $file ('/usr/bin/pstops') {
+    if (! -e $file) {
+        print "WARNING: ".$file." does not appear to be installed.\n";
+    }
+}
 </perlscript>
 </file>
 </files>