[LON-CAPA-cvs] cvs: doc /loncapafiles chkconfig.piml loncapafiles.lpml modify_config_files.piml sanitycheck.piml updatequery.piml wrap_setuid.piml loncom/build distprobe

raeburn lon-capa-cvs-allow@mail.lon-capa.org
Sun, 22 Apr 2007 16:33:29 -0000 

raeburn		Sun Apr 22 12:33:29 2007 EDT

  Modified files:              
    /loncom/build	distprobe 
    /doc/loncapafiles	chkconfig.piml loncapafiles.lpml 
                     	modify_config_files.piml sanitycheck.piml 
                     	updatequery.piml wrap_setuid.piml 
  Log:
  SuSE 10.2
  
  
Index: loncom/build/distprobe
diff -u loncom/build/distprobe:1.10 loncom/build/distprobe:1.11
--- loncom/build/distprobe:1.10	Thu Sep 28 18:58:03 2006
+++ loncom/build/distprobe	Sun Apr 22 12:33:22 2007
@@ -2,7 +2,7 @@
 #
 # The LearningOnline Network with CAPA
 #
-# $Id: distprobe,v 1.10 2006/09/28 22:58:03 raeburn Exp $
+# $Id: distprobe,v 1.11 2007/04/22 16:33:22 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -72,6 +72,8 @@
         $dist='sles'.$1;
     } elsif ($versionstring =~ /^SuSE Linux ([\d\.]+) /i) {
         $dist = 'suse'.$1;
+    } elsif ($versionstring =~ /^openSUSE ([\d\.]+) /i) {
+        $dist = 'suse'.$1;
     } else {
         warn('Unable to interpret /etc/SuSE-release '.
              'to determine system type');
Index: doc/loncapafiles/chkconfig.piml
diff -u doc/loncapafiles/chkconfig.piml:1.4 doc/loncapafiles/chkconfig.piml:1.5
--- doc/loncapafiles/chkconfig.piml:1.4	Thu Sep 28 18:52:43 2006
+++ doc/loncapafiles/chkconfig.piml	Sun Apr 22 12:33:28 2007
@@ -3,7 +3,7 @@
 <!-- phpcheck.piml -->
 <!-- Matthew Hall -->
 
-<!-- $Id: chkconfig.piml,v 1.4 2006/09/28 22:52:43 raeburn Exp $ -->
+<!-- $Id: chkconfig.piml,v 1.5 2007/04/22 16:33:28 raeburn Exp $ -->
 
 <!--
 
@@ -43,7 +43,7 @@
 if ('<DIST />' eq 'suse9.3' || '<DIST />' eq 'suse9.2' || '<DIST />' eq 'sles9') {
     $webserver = 'apache';
     @runlevels = qw/3 5/;
-} elsif ('<DIST />' eq 'sles10' || '<DIST />' eq 'suse10.1') {
+} elsif ('<DIST />' eq 'sles10' || '<DIST />' eq 'suse10.1' || '<DIST />' eq 'suse10.2') {
     $webserver = 'apache2';
 }
 my $command = $chkconfig_bin.' --list '.$webserver;
Index: doc/loncapafiles/loncapafiles.lpml
diff -u doc/loncapafiles/loncapafiles.lpml:1.534 doc/loncapafiles/loncapafiles.lpml:1.535
--- doc/loncapafiles/loncapafiles.lpml:1.534	Fri Apr 20 17:08:52 2007
+++ doc/loncapafiles/loncapafiles.lpml	Sun Apr 22 12:33:28 2007
@@ -2,7 +2,7 @@
  "http://lpml.sourceforge.net/DTD/lpml.dtd">
 <!-- loncapafiles.lpml -->
 
-<!-- $Id: loncapafiles.lpml,v 1.534 2007/04/20 21:08:52 banghart Exp $ -->
+<!-- $Id: loncapafiles.lpml,v 1.535 2007/04/22 16:33:28 raeburn Exp $ -->
 
 <!--
 
@@ -859,7 +859,7 @@
 <file>
 <source>loncom/loncapa.conf</source>
 <target dist='default'>etc/httpd/conf/loncapa.conf</target>
-<target dist='sles10 suse10.1'>etc/apache2/loncapa.conf</target>
+<target dist='sles10 suse10.1 suse10.2'>etc/apache2/loncapa.conf</target>
 <categoryname>conf</categoryname>
 <description>
 <p>
@@ -902,7 +902,7 @@
 <file>
 <source>loncom/loncapa_apache.conf</source>
 <target dist='default'>etc/httpd/conf/loncapa_apache.conf</target>
-<target dist='sles10 suse10.1'>etc/apache2/loncapa_apache.conf</target>
+<target dist='sles10 suse10.1 suse10.2'>etc/apache2/loncapa_apache.conf</target>
 <categoryname>static conf</categoryname>
 <description>
 The goal of this file is to implement all LON-CAPA specific
@@ -922,7 +922,7 @@
 <file>
 <source>loncom/startup.pl</source>
 <target dist='default'>etc/httpd/conf/startup.pl</target>
-<target dist='sles10 suse10.1'>etc/apache2/startup.pl</target>
+<target dist='sles10 suse10.1 suse10.2'>etc/apache2/startup.pl</target>
 <categoryname>static conf</categoryname>
 <description>
 This file provides initializations for perl handlers.  It adjusts what
@@ -5069,7 +5069,7 @@
 <file>
 <source>loncom/mime.types</source>
 <target dist='default'>etc/httpd/conf/mime.types</target>
-<target dist='sles10 suse10.1'>etc/apache2/mime.types</target>
+<target dist='sles10 suse10.1 suse10.2'>etc/apache2/mime.types</target>
 <categoryname>www static conf</categoryname>
 <description>Expanded mime.types</description>
 </file>
@@ -6564,7 +6564,7 @@
 <file>
 <source>loncom/init.d/loncontrol</source>
 <target dist='default'>etc/rc.d/init.d/loncontrol</target>
-<target dist='suse9.2 suse9.3 sles9 sles10 suse10.1'>etc/init.d/loncontrol</target>
+<target dist='suse9.2 suse9.3 sles9 sles10 suse10.1 suse10.2'>etc/init.d/loncontrol</target>
 <categoryname>root script</categoryname>
 <description>
 Controls the launching/halting of lonc, lond, and lonsql processes.
Index: doc/loncapafiles/modify_config_files.piml
diff -u doc/loncapafiles/modify_config_files.piml:1.6 doc/loncapafiles/modify_config_files.piml:1.7
--- doc/loncapafiles/modify_config_files.piml:1.6	Thu Sep 28 18:52:43 2006
+++ doc/loncapafiles/modify_config_files.piml	Sun Apr 22 12:33:28 2007
@@ -3,7 +3,7 @@
 <!-- accesscount_seed.piml -->
 <!-- Matthew Hall -->
 
-<!-- $Id: modify_config_files.piml,v 1.6 2006/09/28 22:52:43 raeburn Exp $ -->
+<!-- $Id: modify_config_files.piml,v 1.7 2007/04/22 16:33:28 raeburn Exp $ -->
 
 <!--
 
@@ -37,7 +37,7 @@
 <perlscript mode="fg">
 my $mysqldaemon = 'mysqld';
 my $configfiles = 'yum and MySQL';
-if ('<DIST />' eq 'suse9.2' || '<DIST />' eq 'suse9.3' || '<DIST />' eq 'sles9' || '<DIST />' eq 'sles10' || '<DIST />' eq 'suse10.1') {
+if ('<DIST />' eq 'suse9.2' || '<DIST />' eq 'suse9.3' || '<DIST />' eq 'sles9' || '<DIST />' eq 'sles10' || '<DIST />' eq 'suse10.1' || '<DIST />' eq 'suse10.2') {
     $mysqldaemon = 'mysql';
     $configfiles = 'MySQL';
 } elsif ('<DIST />' eq 'rhes4') {
Index: doc/loncapafiles/sanitycheck.piml
diff -u doc/loncapafiles/sanitycheck.piml:1.23 doc/loncapafiles/sanitycheck.piml:1.24
--- doc/loncapafiles/sanitycheck.piml:1.23	Fri Apr 13 14:37:27 2007
+++ doc/loncapafiles/sanitycheck.piml	Sun Apr 22 12:33:28 2007
@@ -2,7 +2,7 @@
 	"http://lpml.sourceforge.net/DTD/piml.dtd">
 <!-- sanitycheck.piml -->
 
-<!-- $Id: sanitycheck.piml,v 1.23 2007/04/13 18:37:27 albertel Exp $ -->
+<!-- $Id: sanitycheck.piml,v 1.24 2007/04/22 16:33:28 raeburn Exp $ -->
 
 <!--
 
@@ -111,7 +111,7 @@
 </file>
 <file>
 <target dist='default'>/etc/httpd/conf/loncapa.conf</target>
-<target dist='sles10 suse10.1'>/etc/apache2/loncapa.conf</target>
+<target dist='sles10 suse10.1 suse10.2'>/etc/apache2/loncapa.conf</target>
 <perlscript mode='fg'>
 open IN, "&lt;<TARGET />";
 my $hbug=-1;
Index: doc/loncapafiles/updatequery.piml
diff -u doc/loncapafiles/updatequery.piml:1.55 doc/loncapafiles/updatequery.piml:1.56
--- doc/loncapafiles/updatequery.piml:1.55	Fri Apr 20 15:32:59 2007
+++ doc/loncapafiles/updatequery.piml	Sun Apr 22 12:33:28 2007
@@ -1,6 +1,6 @@
 <!-- updatequery.piml -->
 
-<!-- $Id: updatequery.piml,v 1.55 2007/04/20 19:32:59 albertel Exp $ -->
+<!-- $Id: updatequery.piml,v 1.56 2007/04/22 16:33:28 raeburn Exp $ -->
 
 <!--
 
@@ -477,7 +477,7 @@
 
 # update loncapa.conf
 my $confdir = '/etc/httpd/conf/';
-if ('<DIST />' eq 'sles10' || '<DIST />' eq 'suse10.1') {
+if ('<DIST />' eq 'sles10' || '<DIST />' eq 'suse10.1' || '<DIST />' eq 'suse10.2') {
      $confdir = '/etc/apache2/';
 }   
 my $filename='loncapa.conf';
@@ -534,7 +534,7 @@
 </file>
 <file>
 <target dist='default'>/etc/httpd/conf/</target>
-<target dist='sles10 suse10.1'>/etc/apache2/</target>
+<target dist='sles10 suse10.1 suse10.2'>/etc/apache2/</target>
 <perlscript mode='fg'>
 sub securesetting {
     my (%perlvar)=@_;
Index: doc/loncapafiles/wrap_setuid.piml
diff -u doc/loncapafiles/wrap_setuid.piml:1.5 doc/loncapafiles/wrap_setuid.piml:1.6
--- doc/loncapafiles/wrap_setuid.piml:1.5	Thu Sep 28 18:52:43 2006
+++ doc/loncapafiles/wrap_setuid.piml	Sun Apr 22 12:33:28 2007
@@ -3,7 +3,7 @@
 <!-- wrap_setuid.piml -->
 <!-- Guy Albertelli -->
 
-<!-- $Id: wrap_setuid.piml,v 1.5 2006/09/28 22:52:43 raeburn Exp $ -->
+<!-- $Id: wrap_setuid.piml,v 1.6 2007/04/22 16:33:28 raeburn Exp $ -->
 
 <!--
 
@@ -37,7 +37,7 @@
 <perlscript mode="fg" dist="default">
 #print("Not wrapping setuid scripts\n");
 </perlscript>
-<perlscript mode="fg" dist="suse9.2 suse9.3 sles9 sles10 suse10.1">
+<perlscript mode="fg" dist="suse9.2 suse9.3 sles9 sles10 suse10.1 suse10.2">
 
 $fslist='<TARGET />';
 open(FIND,  "find <TARGET /> -xdev -type f \\( -perm -04000 -o -perm -02000 \\) -print|");