[LON-CAPA-cvs] cvs: doc /loncapafiles chkconfig.piml loncapafiles.lpml modify_config_files.piml rpmcheck.piml sanitycheck.piml updatequery.piml webserver.piml wrap_setuid.piml
raeburn
lon-capa-cvs-allow@mail.lon-capa.org
Fri, 07 Dec 2007 06:01:10 -0000
This is a MIME encoded message
--raeburn1197007270
Content-Type: text/plain
raeburn Fri Dec 7 01:01:10 2007 EDT
Modified files:
/doc/loncapafiles chkconfig.piml loncapafiles.lpml
modify_config_files.piml rpmcheck.piml
sanitycheck.piml updatequery.piml webserver.piml
wrap_setuid.piml
Log:
support SuSE 10.3
--raeburn1197007270
Content-Type: text/plain
Content-Disposition: attachment; filename="raeburn-20071207010110.txt"
Index: doc/loncapafiles/chkconfig.piml
diff -u doc/loncapafiles/chkconfig.piml:1.5 doc/loncapafiles/chkconfig.piml:1.6
--- doc/loncapafiles/chkconfig.piml:1.5 Sun Apr 22 12:33:28 2007
+++ doc/loncapafiles/chkconfig.piml Fri Dec 7 01:01:06 2007
@@ -3,7 +3,7 @@
<!-- phpcheck.piml -->
<!-- Matthew Hall -->
-<!-- $Id: chkconfig.piml,v 1.5 2007/04/22 16:33:28 raeburn Exp $ -->
+<!-- $Id: chkconfig.piml,v 1.6 2007/12/07 06:01:06 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') {
+} elsif ('<DIST />' eq 'sles10' || '<DIST />' eq 'suse10.1' || '<DIST />' eq 'suse10.2' || '<DIST />' eq 'suse10.3') {
$webserver = 'apache2';
}
my $command = $chkconfig_bin.' --list '.$webserver;
Index: doc/loncapafiles/loncapafiles.lpml
diff -u doc/loncapafiles/loncapafiles.lpml:1.562 doc/loncapafiles/loncapafiles.lpml:1.563
--- doc/loncapafiles/loncapafiles.lpml:1.562 Tue Dec 4 13:08:53 2007
+++ doc/loncapafiles/loncapafiles.lpml Fri Dec 7 01:01:06 2007
@@ -2,7 +2,7 @@
"http://lpml.sourceforge.net/DTD/lpml.dtd">
<!-- loncapafiles.lpml -->
-<!-- $Id: loncapafiles.lpml,v 1.562 2007/12/04 18:08:53 albertel Exp $ -->
+<!-- $Id: loncapafiles.lpml,v 1.563 2007/12/07 06:01:06 raeburn Exp $ -->
<!--
@@ -805,7 +805,7 @@
<file>
<source>loncom/loncapa.conf</source>
<target dist='default'>etc/httpd/conf/loncapa.conf</target>
-<target dist='sles10 suse10.1 suse10.2'>etc/apache2/loncapa.conf</target>
+<target dist='sles10 suse10.1 suse10.2 suse10.3'>etc/apache2/loncapa.conf</target>
<categoryname>conf</categoryname>
<description>
<p>
@@ -848,7 +848,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'>etc/apache2/loncapa_apache.conf</target>
+<target dist='sles10 suse10.1 suse10.2 suse10.3'>etc/apache2/loncapa_apache.conf</target>
<categoryname>static conf</categoryname>
<description>
The goal of this file is to implement all LON-CAPA specific
@@ -868,7 +868,7 @@
<file>
<source>loncom/startup.pl</source>
<target dist='default'>etc/httpd/conf/startup.pl</target>
-<target dist='sles10 suse10.1 suse10.2'>etc/apache2/startup.pl</target>
+<target dist='sles10 suse10.1 suse10.2 suse10.3'>etc/apache2/startup.pl</target>
<categoryname>static conf</categoryname>
<description>
This file provides initializations for perl handlers. It adjusts what
@@ -4958,7 +4958,7 @@
<file>
<source>loncom/mime.types</source>
<target dist='default'>etc/httpd/conf/mime.types</target>
-<target dist='sles10 suse10.1 suse10.2'>etc/apache2/mime.types</target>
+<target dist='sles10 suse10.1 suse10.2 suse10.3'>etc/apache2/mime.types</target>
<categoryname>www static conf</categoryname>
<description>Expanded mime.types</description>
</file>
@@ -6461,7 +6461,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'>etc/init.d/loncontrol</target>
+<target dist='suse9.2 suse9.3 sles9 sles10 suse10.1 suse10.2 suse10.3'>etc/init.d/loncontrol</target>
<categoryname>root script</categoryname>
<description>
Controls the launching/halting of lonc, lond, and lonsql processes.
@@ -6469,7 +6469,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'>etc/init.d/loncontrol</linkto>
+<linkto dist='suse9.2 suse9.3 sles9 sles10 suse10.1 suse10.2 suse10.3'>etc/init.d/loncontrol</linkto>
<target dist='default'>
etc/rc.d/rc0.d/K05loncontrol;
etc/rc.d/rc1.d/K05loncontrol;
@@ -6479,19 +6479,19 @@
etc/rc.d/rc5.d/S95loncontrol;
etc/rc.d/rc6.d/K05loncontrol
</target>
-<target dist='suse10.2'></target>
+<target dist='suse10.2 suse10.3'></target>
<categoryname>symbolic link</categoryname>
<description>
symbolic links to /etc/rc.d/init.d/loncontrol for run-levels</description>
</link>
-<file dist="suse10.2">
+<file dist="suse10.2 suse10.3">
<source>loncom/init.d/loncontrol</source>
<target>etc/rc.d/</target>
<description>
setup loncontrol to run at boot
</description>
- <installscript dist="suse10.2">
+ <installscript dist="suse10.2 suse10.3">
-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.7 doc/loncapafiles/modify_config_files.piml:1.8
--- doc/loncapafiles/modify_config_files.piml:1.7 Sun Apr 22 12:33:28 2007
+++ doc/loncapafiles/modify_config_files.piml Fri Dec 7 01:01:06 2007
@@ -3,7 +3,7 @@
<!-- accesscount_seed.piml -->
<!-- Matthew Hall -->
-<!-- $Id: modify_config_files.piml,v 1.7 2007/04/22 16:33:28 raeburn Exp $ -->
+<!-- $Id: modify_config_files.piml,v 1.8 2007/12/07 06:01:06 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') {
+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') {
$mysqldaemon = 'mysql';
$configfiles = 'MySQL';
} elsif ('<DIST />' eq 'rhes4') {
Index: doc/loncapafiles/rpmcheck.piml
diff -u doc/loncapafiles/rpmcheck.piml:1.12 doc/loncapafiles/rpmcheck.piml:1.13
--- doc/loncapafiles/rpmcheck.piml:1.12 Mon Dec 5 16:44:51 2005
+++ doc/loncapafiles/rpmcheck.piml Fri Dec 7 01:01:06 2007
@@ -3,7 +3,7 @@
<!-- phpcheck.piml -->
<!-- Matthew Hall -->
-<!-- $Id: rpmcheck.piml,v 1.12 2005/12/05 21:44:51 albertel Exp $ -->
+<!-- $Id: rpmcheck.piml,v 1.13 2007/12/07 06:01:06 raeburn Exp $ -->
<!--
@@ -81,7 +81,7 @@
}
}
</perlscript>
-<perlscript dist="fedora1 fedora2 fedora3 fedora4 suse9.2 suse9.3 sles9" mode="fg">
+<perlscript dist="fedora1 fedora2 fedora3 fedora4 fedora5 fedora6 fedora7 fedora8 suse9.2 suse9.3 suse10.1 suse10.2 suse10.3 sles9 sles10" 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.24 doc/loncapafiles/sanitycheck.piml:1.25
--- doc/loncapafiles/sanitycheck.piml:1.24 Sun Apr 22 12:33:28 2007
+++ doc/loncapafiles/sanitycheck.piml Fri Dec 7 01:01:06 2007
@@ -2,7 +2,7 @@
"http://lpml.sourceforge.net/DTD/piml.dtd">
<!-- sanitycheck.piml -->
-<!-- $Id: sanitycheck.piml,v 1.24 2007/04/22 16:33:28 raeburn Exp $ -->
+<!-- $Id: sanitycheck.piml,v 1.25 2007/12/07 06:01:06 raeburn Exp $ -->
<!--
@@ -111,7 +111,7 @@
</file>
<file>
<target dist='default'>/etc/httpd/conf/loncapa.conf</target>
-<target dist='sles10 suse10.1 suse10.2'>/etc/apache2/loncapa.conf</target>
+<target dist='sles10 suse10.1 suse10.2 suse10.3'>/etc/apache2/loncapa.conf</target>
<perlscript mode='fg'>
open IN, "<<TARGET />";
my $hbug=-1;
Index: doc/loncapafiles/updatequery.piml
diff -u doc/loncapafiles/updatequery.piml:1.58 doc/loncapafiles/updatequery.piml:1.59
--- doc/loncapafiles/updatequery.piml:1.58 Tue May 22 19:16:47 2007
+++ doc/loncapafiles/updatequery.piml Fri Dec 7 01:01:06 2007
@@ -1,6 +1,6 @@
<!-- updatequery.piml -->
-<!-- $Id: updatequery.piml,v 1.58 2007/05/22 23:16:47 albertel Exp $ -->
+<!-- $Id: updatequery.piml,v 1.59 2007/12/07 06:01:06 raeburn Exp $ -->
<!--
@@ -477,7 +477,7 @@
# update loncapa.conf
my $confdir = '/etc/httpd/conf/';
-if ('<DIST />' eq 'sles10' || '<DIST />' eq 'suse10.1' || '<DIST />' eq 'suse10.2') {
+if ('<DIST />' eq 'sles10' || '<DIST />' eq 'suse10.1' || '<DIST />' eq 'suse10.2' || '<DIST />' eq 'suse10.3') {
$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 suse10.2'>/etc/apache2/</target>
+<target dist='sles10 suse10.1 suse10.2 suse10.3'>/etc/apache2/</target>
<perlscript mode='fg'>
sub securesetting {
my (%perlvar)=@_;
Index: doc/loncapafiles/webserver.piml
diff -u doc/loncapafiles/webserver.piml:1.22 doc/loncapafiles/webserver.piml:1.23
--- doc/loncapafiles/webserver.piml:1.22 Fri Jun 1 17:05:19 2007
+++ doc/loncapafiles/webserver.piml Fri Dec 7 01:01:06 2007
@@ -2,7 +2,7 @@
"http://lpml.sourceforge.net/DTD/piml.dtd">
<!-- webserver.piml -->
-<!-- $Id: webserver.piml,v 1.22 2007/06/01 21:05:19 albertel Exp $ -->
+<!-- $Id: webserver.piml,v 1.23 2007/12/07 06:01:06 raeburn Exp $ -->
<!--
@@ -46,15 +46,15 @@
<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'>/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>
+<target dist='sles10 suse10.1 suse10.2 suse10.3'>/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
</dependencies>
<dependencies dist='suse9.2 suse9.3 sles9'>
/etc/httpd/httpd.conf
</dependencies>
-<dependencies dist='sles10 suse10.1 suse10.2'>
+<dependencies dist='sles10 suse10.1 suse10.2 suse10.3'>
/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.6 doc/loncapafiles/wrap_setuid.piml:1.7
--- doc/loncapafiles/wrap_setuid.piml:1.6 Sun Apr 22 12:33:28 2007
+++ doc/loncapafiles/wrap_setuid.piml Fri Dec 7 01:01:06 2007
@@ -3,7 +3,7 @@
<!-- wrap_setuid.piml -->
<!-- Guy Albertelli -->
-<!-- $Id: wrap_setuid.piml,v 1.6 2007/04/22 16:33:28 raeburn Exp $ -->
+<!-- $Id: wrap_setuid.piml,v 1.7 2007/12/07 06:01:06 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">
+<perlscript mode="fg" dist="suse9.2 suse9.3 sles9 sles10 suse10.1 suse10.2 suse10.3">
$fslist='<TARGET />';
open(FIND, "find <TARGET /> -xdev -type f \\( -perm -04000 -o -perm -02000 \\) -print|");
--raeburn1197007270--