[LON-CAPA-cvs] cvs: doc /loncapafiles chkconfig.piml loncapafiles.lpml modify_config_files.piml picins_check.piml rpmcheck.piml sanitycheck.piml updatequery.piml webserver.piml wrap_setuid.piml

raeburn raeburn@source.lon-capa.org
Sun, 05 Jul 2009 21:23:42 -0000 

This is a MIME encoded message

--raeburn1246829022
Content-Type: text/plain

raeburn		Sun Jul  5 21:23:42 2009 EDT

  Modified files:              
    /doc/loncapafiles	chkconfig.piml loncapafiles.lpml 
                     	modify_config_files.piml picins_check.piml 
                     	rpmcheck.piml sanitycheck.piml updatequery.piml 
                     	webserver.piml wrap_setuid.piml 
  Log:
  - Support fedora10, fedora11 (like fedora9 use texlive instead of tetex)
  - Support for suse11.1 (also uses texlive).
  
  
--raeburn1246829022
Content-Type: text/plain
Content-Disposition: attachment; filename="raeburn-20090705212342.txt"

Index: doc/loncapafiles/chkconfig.piml
diff -u doc/loncapafiles/chkconfig.piml:1.6 doc/loncapafiles/chkconfig.piml:1.7
--- doc/loncapafiles/chkconfig.piml:1.6	Fri Dec  7 06:01:06 2007
+++ doc/loncapafiles/chkconfig.piml	Sun Jul  5 21:23:42 2009
@@ -3,7 +3,7 @@
 <!-- phpcheck.piml -->
 <!-- Matthew Hall -->
 
-<!-- $Id: chkconfig.piml,v 1.6 2007/12/07 06:01:06 raeburn Exp $ -->
+<!-- $Id: chkconfig.piml,v 1.7 2009/07/05 21:23:42 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' || '<DIST />' eq 'suse10.2' || '<DIST />' eq 'suse10.3') {
+} elsif ('<DIST />' eq 'sles10' || '<DIST />' eq 'suse10.1' || '<DIST />' eq 'suse10.2' || '<DIST />' eq 'suse10.3' || '<DIST />' eq 'suse11.1') {
     $webserver = 'apache2';
 }
 my $command = $chkconfig_bin.' --list '.$webserver;
Index: doc/loncapafiles/loncapafiles.lpml
diff -u doc/loncapafiles/loncapafiles.lpml:1.647 doc/loncapafiles/loncapafiles.lpml:1.648
--- doc/loncapafiles/loncapafiles.lpml:1.647	Thu Jun 11 00:18:37 2009
+++ doc/loncapafiles/loncapafiles.lpml	Sun Jul  5 21:23:42 2009
@@ -2,7 +2,7 @@
  "http://lpml.sourceforge.net/DTD/lpml.dtd">
 <!-- loncapafiles.lpml -->
 
-<!-- $Id: loncapafiles.lpml,v 1.647 2009/06/11 00:18:37 raeburn Exp $ -->
+<!-- $Id: loncapafiles.lpml,v 1.648 2009/07/05 21:23:42 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 suse10.2 suse10.3'>etc/apache2/loncapa.conf</target>
+<target dist='sles10 suse10.1 suse10.2 suse10.3 suse11.1'>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 suse10.2 suse10.3'>etc/apache2/loncapa_apache.conf</target>
+<target dist='sles10 suse10.1 suse10.2 suse10.3 suse11.1'>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 suse10.2 suse10.3'>etc/apache2/startup.pl</target>
+<target dist='sles10 suse10.1 suse10.2 suse10.3 suse11.1'>etc/apache2/startup.pl</target>
 <categoryname>static conf</categoryname>
 <description>
 This file provides initializations for perl handlers.  It adjusts what
@@ -5339,7 +5339,7 @@
 <file>
 <source>loncom/mime.types</source>
 <target dist='default'>etc/httpd/conf/mime.types</target>
-<target dist='sles10 suse10.1 suse10.2 suse10.3'>etc/apache2/mime.types</target>
+<target dist='sles10 suse10.1 suse10.2 suse10.3 suse11.1'>etc/apache2/mime.types</target>
 <categoryname>www static conf</categoryname>
 <description>Expanded mime.types</description>
 </file>
@@ -6947,7 +6947,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 suse10.2 suse10.3'>etc/init.d/loncontrol</target>
+<target dist='suse9.2 suse9.3 sles9 sles10 suse10.1 suse10.2 suse10.3 suse11.1'>etc/init.d/loncontrol</target>
 <categoryname>root script</categoryname>
 <description>
 Controls the launching/halting of lonc, lond, and lonsql processes.
@@ -6955,7 +6955,7 @@
 </file>
 <link>
 <linkto dist='default'>etc/rc.d/init.d/loncontrol</linkto>
-<linkto dist='suse9.2 suse9.3 sles9 sles10 suse10.1 suse10.2 suse10.3'>etc/init.d/loncontrol</linkto>
+<linkto dist='suse9.2 suse9.3 sles9 sles10 suse10.1 suse10.2 suse10.3 suse11.1'>etc/init.d/loncontrol</linkto>
 <target dist='default'>
 etc/rc.d/rc0.d/K05loncontrol;
 etc/rc.d/rc1.d/K05loncontrol;
@@ -6965,19 +6965,19 @@
 etc/rc.d/rc5.d/S95loncontrol;
 etc/rc.d/rc6.d/K05loncontrol
 </target>
-<target dist='suse10.2 suse10.3'></target>
+<target dist='suse10.2 suse10.3 suse11.1'></target>
 <categoryname>symbolic link</categoryname>
 <description>
 symbolic links to /etc/rc.d/init.d/loncontrol for run-levels</description>
 </link>
 
-<file dist="suse10.2 suse10.3">
+<file dist="suse10.2 suse10.3 suse11.1">
   <source>loncom/init.d/loncontrol</source>
   <target>etc/rc.d/</target>
   <description>
     setup loncontrol to run at boot
   </description>
-  <installscript dist="suse10.2 suse10.3">
+  <installscript dist="suse10.2 suse10.3 suse11.1">
 -c 'chkconfig --del loncontrol;chkconfig loncontrol 345;chkconfig --list loncontrol'
   </installscript>
   <dependencies>
Index: doc/loncapafiles/modify_config_files.piml
diff -u doc/loncapafiles/modify_config_files.piml:1.8 doc/loncapafiles/modify_config_files.piml:1.9
--- doc/loncapafiles/modify_config_files.piml:1.8	Fri Dec  7 06:01:06 2007
+++ doc/loncapafiles/modify_config_files.piml	Sun Jul  5 21:23:42 2009
@@ -3,7 +3,7 @@
 <!-- accesscount_seed.piml -->
 <!-- Matthew Hall -->
 
-<!-- $Id: modify_config_files.piml,v 1.8 2007/12/07 06:01:06 raeburn Exp $ -->
+<!-- $Id: modify_config_files.piml,v 1.9 2009/07/05 21:23:42 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' || '<DIST />' eq 'suse10.2' || '<DIST />' eq 'suse10.3') {
+if ('<DIST />' eq 'suse9.2' || '<DIST />' eq 'suse9.3' || '<DIST />' eq 'sles9' || '<DIST />' eq 'sles10' || '<DIST />' eq 'suse10.1' || '<DIST />' eq 'suse10.2' || '<DIST />' eq 'suse10.3' || '<DIST />' eq 'suse11.1') {
     $mysqldaemon = 'mysql';
     $configfiles = 'MySQL';
 } elsif ('<DIST />' eq 'rhes4') {
Index: doc/loncapafiles/picins_check.piml
diff -u doc/loncapafiles/picins_check.piml:1.1 doc/loncapafiles/picins_check.piml:1.2
--- doc/loncapafiles/picins_check.piml:1.1	Sun Sep 21 00:35:59 2008
+++ doc/loncapafiles/picins_check.piml	Sun Jul  5 21:23:42 2009
@@ -3,7 +3,7 @@
 <!-- picins_check.piml -->
 <!-- Stuart Raeburn -->
 
-<!-- $Id: picins_check.piml,v 1.1 2008/09/21 00:35:59 raeburn Exp $ -->
+<!-- $Id: picins_check.piml,v 1.2 2009/07/05 21:23:42 raeburn Exp $ -->
 
 <!--
 
@@ -32,7 +32,7 @@
 <piml>
 <files>
 <file>
-<perlscript mode="fg" dist="fedora9">
+<perlscript mode="fg" dist="fedora9 fedora10 fedora11 sles11.1">
     my $picinspath = '/usr/share/texmf/tex/latex/picins'; 
     my $file = 'picins.sty';
     if (!-e "$picinspath/$file") {
Index: doc/loncapafiles/rpmcheck.piml
diff -u doc/loncapafiles/rpmcheck.piml:1.14 doc/loncapafiles/rpmcheck.piml:1.15
--- doc/loncapafiles/rpmcheck.piml:1.14	Wed Aug 27 20:05:47 2008
+++ doc/loncapafiles/rpmcheck.piml	Sun Jul  5 21:23:42 2009
@@ -3,7 +3,7 @@
 <!-- phpcheck.piml -->
 <!-- Matthew Hall -->
 
-<!-- $Id: rpmcheck.piml,v 1.14 2008/08/27 20:05:47 raeburn Exp $ -->
+<!-- $Id: rpmcheck.piml,v 1.15 2009/07/05 21:23:42 raeburn Exp $ -->
 
 <!--
 
@@ -81,7 +81,7 @@
     }
 }
 </perlscript>
-<perlscript dist="fedora1 fedora2 fedora3 fedora4 fedora5 fedora6 fedora7 fedora8 fedora9 suse9.2 suse9.3 suse10.1 suse10.2 suse10.3 sles9 sles10" mode="fg">
+<perlscript dist="fedora1 fedora2 fedora3 fedora4 fedora5 fedora6 fedora7 fedora8 fedora9 fedora10 fedora11 suse9.2 suse9.3 suse10.1 suse10.2 suse10.3 sles9 sles10 suse11.1" mode="fg">
 my @RPMS = `rpm -q -a`;
 foreach my $rpm ('LONCAPA-prerequisites') {
     my @matching_rpms = grep(/$rpm/,@RPMS);
Index: doc/loncapafiles/sanitycheck.piml
diff -u doc/loncapafiles/sanitycheck.piml:1.25 doc/loncapafiles/sanitycheck.piml:1.26
--- doc/loncapafiles/sanitycheck.piml:1.25	Fri Dec  7 06:01:06 2007
+++ doc/loncapafiles/sanitycheck.piml	Sun Jul  5 21:23:42 2009
@@ -2,7 +2,7 @@
 	"http://lpml.sourceforge.net/DTD/piml.dtd">
 <!-- sanitycheck.piml -->
 
-<!-- $Id: sanitycheck.piml,v 1.25 2007/12/07 06:01:06 raeburn Exp $ -->
+<!-- $Id: sanitycheck.piml,v 1.26 2009/07/05 21:23:42 raeburn Exp $ -->
 
 <!--
 
@@ -111,7 +111,7 @@
 </file>
 <file>
 <target dist='default'>/etc/httpd/conf/loncapa.conf</target>
-<target dist='sles10 suse10.1 suse10.2 suse10.3'>/etc/apache2/loncapa.conf</target>
+<target dist='sles10 suse10.1 suse10.2 suse10.3 suse11.1'>/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.60 doc/loncapafiles/updatequery.piml:1.61
--- doc/loncapafiles/updatequery.piml:1.60	Thu Feb 12 18:22:34 2009
+++ doc/loncapafiles/updatequery.piml	Sun Jul  5 21:23:42 2009
@@ -1,6 +1,6 @@
 <!-- updatequery.piml -->
 
-<!-- $Id: updatequery.piml,v 1.60 2009/02/12 18:22:34 raeburn Exp $ -->
+<!-- $Id: updatequery.piml,v 1.61 2009/07/05 21:23:42 raeburn Exp $ -->
 
 <!--
 
@@ -500,7 +500,7 @@
 
 # update loncapa.conf
 my $confdir = '/etc/httpd/conf/';
-if ('<DIST />' eq 'sles10' || '<DIST />' eq 'suse10.1' || '<DIST />' eq 'suse10.2' || '<DIST />' eq 'suse10.3') {
+if ('<DIST />' eq 'sles10' || '<DIST />' eq 'suse10.1' || '<DIST />' eq 'suse10.2' || '<DIST />' eq 'suse10.3' || '<DIST />' eq 'suse11.1') {
      $confdir = '/etc/apache2/';
 }   
 my $filename='loncapa.conf';
@@ -557,7 +557,7 @@
 </file>
 <file>
 <target dist='default'>/etc/httpd/conf/</target>
-<target dist='sles10 suse10.1 suse10.2 suse10.3'>/etc/apache2/</target>
+<target dist='sles10 suse10.1 suse10.2 suse10.3 suse11.1'>/etc/apache2/</target>
 <perlscript mode='fg'>
 sub securesetting {
     my (%perlvar)=@_;
Index: doc/loncapafiles/webserver.piml
diff -u doc/loncapafiles/webserver.piml:1.23 doc/loncapafiles/webserver.piml:1.24
--- doc/loncapafiles/webserver.piml:1.23	Fri Dec  7 06:01:06 2007
+++ doc/loncapafiles/webserver.piml	Sun Jul  5 21:23:42 2009
@@ -2,7 +2,7 @@
 	"http://lpml.sourceforge.net/DTD/piml.dtd">
 <!-- webserver.piml -->
 
-<!-- $Id: webserver.piml,v 1.23 2007/12/07 06:01:06 raeburn Exp $ -->
+<!-- $Id: webserver.piml,v 1.24 2009/07/05 21:23:42 raeburn Exp $ -->
 
 <!--
 
@@ -46,7 +46,7 @@
 <file>
 <target dist='default'>/etc/httpd/conf/httpd.conf</target>
 <target dist='suse9.2 suse9.3 sles9'>/etc/httpd/httpd.conf</target>
-<target dist='sles10 suse10.1 suse10.2 suse10.3'>/etc/apache2/default-server.conf</target>
+<target dist='sles10 suse10.1 suse10.2 suse10.3 suse11.1'>/etc/apache2/default-server.conf</target>
 <note>This is for Apache 1.X for Red Hat, Fedora 2,3 and 4, and SusSE 9.2, 9.3 and SLES 9 distributions. This is for Apache 2.X for Fedora 5 and later, and SuSE 10.X and SLES 10 distribtions</note>
 <dependencies dist='default'>
 /etc/httpd/conf/httpd.conf
@@ -54,7 +54,7 @@
 <dependencies dist='suse9.2 suse9.3 sles9'>
 /etc/httpd/httpd.conf
 </dependencies>
-<dependencies dist='sles10 suse10.1 suse10.2 suse10.3'>
+<dependencies dist='sles10 suse10.1 suse10.2 suse10.3 suse11.1'>
 /etc/apache2/default-server.conf
 </dependencies>
 <perlscript mode='fg' dist="default">
Index: doc/loncapafiles/wrap_setuid.piml
diff -u doc/loncapafiles/wrap_setuid.piml:1.7 doc/loncapafiles/wrap_setuid.piml:1.8
--- doc/loncapafiles/wrap_setuid.piml:1.7	Fri Dec  7 06:01:06 2007
+++ doc/loncapafiles/wrap_setuid.piml	Sun Jul  5 21:23:42 2009
@@ -3,7 +3,7 @@
 <!-- wrap_setuid.piml -->
 <!-- Guy Albertelli -->
 
-<!-- $Id: wrap_setuid.piml,v 1.7 2007/12/07 06:01:06 raeburn Exp $ -->
+<!-- $Id: wrap_setuid.piml,v 1.8 2009/07/05 21:23:42 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 suse10.2 suse10.3">
+<perlscript mode="fg" dist="suse9.2 suse9.3 sles9 sles10 suse10.1 suse10.2 suse10.3 suse11.1">
 
 $fslist='<TARGET />';
 open(FIND,  "find <TARGET /> -xdev -type f \\( -perm -04000 -o -perm -02000 \\) -print|");

--raeburn1246829022--