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

raeburn lon-capa-cvs@mail.lon-capa.org
Thu, 28 Sep 2006 22:52:43 -0000 

raeburn		Thu Sep 28 18:52:43 2006 EDT

  Modified files:              
    /doc/loncapafiles	chkconfig.piml modify_config_files.piml 
                     	sanitycheck.piml updatequery.piml webserver.piml 
                     	wrap_setuid.piml 
  Log:
  Some SuSE 10.1 additions.
  
  
Index: doc/loncapafiles/chkconfig.piml
diff -u doc/loncapafiles/chkconfig.piml:1.3 doc/loncapafiles/chkconfig.piml:1.4
--- doc/loncapafiles/chkconfig.piml:1.3	Fri Sep 15 16:51:56 2006
+++ doc/loncapafiles/chkconfig.piml	Thu Sep 28 18:52:43 2006
@@ -3,7 +3,7 @@
 <!-- phpcheck.piml -->
 <!-- Matthew Hall -->
 
-<!-- $Id: chkconfig.piml,v 1.3 2006/09/15 20:51:56 raeburn Exp $ -->
+<!-- $Id: chkconfig.piml,v 1.4 2006/09/28 22:52:43 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') {
+} elsif ('<DIST />' eq 'sles10' || '<DIST />' eq 'suse10.1') {
     $webserver = 'apache2';
 }
 my $command = $chkconfig_bin.' --list '.$webserver;
Index: doc/loncapafiles/modify_config_files.piml
diff -u doc/loncapafiles/modify_config_files.piml:1.5 doc/loncapafiles/modify_config_files.piml:1.6
--- doc/loncapafiles/modify_config_files.piml:1.5	Fri Sep 15 16:54:31 2006
+++ doc/loncapafiles/modify_config_files.piml	Thu Sep 28 18:52:43 2006
@@ -3,7 +3,7 @@
 <!-- accesscount_seed.piml -->
 <!-- Matthew Hall -->
 
-<!-- $Id: modify_config_files.piml,v 1.5 2006/09/15 20:54:31 raeburn Exp $ -->
+<!-- $Id: modify_config_files.piml,v 1.6 2006/09/28 22:52:43 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') {
+if ('<DIST />' eq 'suse9.2' || '<DIST />' eq 'suse9.3' || '<DIST />' eq 'sles9' || '<DIST />' eq 'sles10' || '<DIST />' eq 'suse10.1') {
     $mysqldaemon = 'mysql';
     $configfiles = 'MySQL';
 } elsif ('<DIST />' eq 'rhes4') {
Index: doc/loncapafiles/sanitycheck.piml
diff -u doc/loncapafiles/sanitycheck.piml:1.19 doc/loncapafiles/sanitycheck.piml:1.20
--- doc/loncapafiles/sanitycheck.piml:1.19	Wed Sep 27 22:27:37 2006
+++ doc/loncapafiles/sanitycheck.piml	Thu Sep 28 18:52:43 2006
@@ -2,7 +2,7 @@
 	"http://lpml.sourceforge.net/DTD/piml.dtd">
 <!-- sanitycheck.piml -->
 
-<!-- $Id: sanitycheck.piml,v 1.19 2006/09/28 02:27:37 albertel Exp $ -->
+<!-- $Id: sanitycheck.piml,v 1.20 2006/09/28 22:52:43 raeburn Exp $ -->
 
 <!--
 
@@ -112,7 +112,7 @@
 <file>
 <target dist='default'>/etc/httpd/conf/loncapa.conf</target>
 <target dist='suse9.3 suse9.2 sles9'>/etc/httpd/loncapa.conf</target>
-<target dist='sles10'>/etc/apache2/loncapa.conf</target>
+<target dist='sles10 suse10.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.49 doc/loncapafiles/updatequery.piml:1.50
--- doc/loncapafiles/updatequery.piml:1.49	Fri Sep 15 17:01:07 2006
+++ doc/loncapafiles/updatequery.piml	Thu Sep 28 18:52:43 2006
@@ -1,6 +1,6 @@
 <!-- updatequery.piml -->
 
-<!-- $Id: updatequery.piml,v 1.49 2006/09/15 21:01:07 raeburn Exp $ -->
+<!-- $Id: updatequery.piml,v 1.50 2006/09/28 22:52:43 raeburn Exp $ -->
 
 <!--
 
@@ -483,7 +483,7 @@
 
 # update loncapa.conf
 my $confdir = '/etc/httpd/conf/';
-if ('<DIST />' eq 'sles10') {
+if ('<DIST />' eq 'sles10' || '<DIST />' eq 'suse10.1') {
      $confdir = '/etc/apache2/';
 }   
 my $filename='loncapa.conf';
@@ -540,7 +540,7 @@
 </file>
 <file>
 <target dist='default'>/etc/httpd/conf/</target>
-<target dist='sles10'>/etc/apache2/</target>
+<target dist='sles10 suse10.1'>/etc/apache2/</target>
 <perlscript mode='fg'>
 sub securesetting {
     my (%perlvar)=@_;
Index: doc/loncapafiles/webserver.piml
diff -u doc/loncapafiles/webserver.piml:1.20 doc/loncapafiles/webserver.piml:1.21
--- doc/loncapafiles/webserver.piml:1.20	Fri Sep 15 17:02:15 2006
+++ doc/loncapafiles/webserver.piml	Thu Sep 28 18:52:43 2006
@@ -2,7 +2,7 @@
 	"http://lpml.sourceforge.net/DTD/piml.dtd">
 <!-- webserver.piml -->
 
-<!-- $Id: webserver.piml,v 1.20 2006/09/15 21:02:15 raeburn Exp $ -->
+<!-- $Id: webserver.piml,v 1.21 2006/09/28 22:52:43 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'>/etc/apache2/default-server.conf</target>
+<target dist='sles10 suse10.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 SuSE 10.1 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'>
+<dependencies dist='sles10 suse10.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.4 doc/loncapafiles/wrap_setuid.piml:1.5
--- doc/loncapafiles/wrap_setuid.piml:1.4	Fri Sep 15 17:02:56 2006
+++ doc/loncapafiles/wrap_setuid.piml	Thu Sep 28 18:52:43 2006
@@ -3,7 +3,7 @@
 <!-- wrap_setuid.piml -->
 <!-- Guy Albertelli -->
 
-<!-- $Id: wrap_setuid.piml,v 1.4 2006/09/15 21:02:56 raeburn Exp $ -->
+<!-- $Id: wrap_setuid.piml,v 1.5 2006/09/28 22:52:43 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">
+<perlscript mode="fg" dist="suse9.2 suse9.3 sles9 sles10 suse10.1">
 
 $fslist='<TARGET />';
 open(FIND,  "find <TARGET /> -xdev -type f \\( -perm -04000 -o -perm -02000 \\) -print|");