[prev in list] [next in list] [prev in thread] [next in thread]
List: lon-capa-cvs
Subject: [LON-CAPA-cvs] cvs: doc /loncapafiles chkconfig.piml loncapafiles.lpml modify_config_files.piml pici
From: raeburn <raeburn () source ! lon-capa ! org>
Date: 2012-10-05 15:36:22
Message-ID: cvsraeburn1349451382 () cvsserver
[Download RAW message or body]
This is a MIME encoded message
raeburn Fri Oct 5 15:36:22 2012 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 for SuSE 12.2
["raeburn-20121005153622.txt" (text/plain)]
Index: doc/loncapafiles/chkconfig.piml
diff -u doc/loncapafiles/chkconfig.piml:1.23 doc/loncapafiles/chkconfig.piml:1.24
--- doc/loncapafiles/chkconfig.piml:1.23 Mon Jul 30 01:37:22 2012
+++ doc/loncapafiles/chkconfig.piml Fri Oct 5 15:36:21 2012
@@ -3,7 +3,7 @@
<!-- checkconfig.piml -->
<!-- Matthew Hall -->
-<!-- $Id: chkconfig.piml,v 1.23 2012/07/30 01:37:22 raeburn Exp $ -->
+<!-- $Id: chkconfig.piml,v 1.24 2012/10/05 15:36:21 raeburn Exp $ -->
<!--
@@ -45,7 +45,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 'sles11' || '<DIST />' eq \
'suse10.1' || '<DIST />' eq 'suse10.2' || '<DIST />' eq 'suse10.3' || '<DIST />' eq \
'suse11.1' || '<DIST />' eq 'suse11.2' || '<DIST />' eq 'suse11.3' || '<DIST />' eq \
'suse11.4' || '<DIST />' eq 'suse12.1') { +} elsif ('<DIST />' eq 'sles10' || '<DIST \
/>' eq 'sles11' || '<DIST />' eq 'suse10.1' || '<DIST />' eq 'suse10.2' || '<DIST />' \
eq 'suse10.3' || '<DIST />' eq 'suse11.1' || '<DIST />' eq 'suse11.2' || '<DIST />' \
eq 'suse11.3' || '<DIST />' eq 'suse11.4' || '<DIST />' eq 'suse12.1' || '<DIST />' \
eq 'suse12.2') { $webserver = 'apache2';
@runlevels = qw/3 5/;
} elsif ('<DIST />' eq 'debian5' || '<DIST />' eq 'debian6' || '<DIST />' eq \
'ubuntu6' || '<DIST />' eq 'ubuntu8' || '<DIST />' eq 'ubuntu10' || '<DIST />' eq \
'ubuntu12') { @@ -54,7 +54,8 @@
$checker_bin = '/usr/sbin/sysv-rc-conf';
$webserver = 'apache2';
}
-if (('<DIST />' eq 'fedora16') || ('<DIST />' eq 'fedora17') || ('<DIST />' eq \
'suse12.1')) { +if (('<DIST />' eq 'fedora16') || ('<DIST />' eq 'fedora17') || \
('<DIST />' eq 'suse12.1') || + ('<DIST />' eq 'suse12.2')) {
$use_systemctl = 1;
}
exit if (! -x $checker_bin);
Index: doc/loncapafiles/loncapafiles.lpml
diff -u doc/loncapafiles/loncapafiles.lpml:1.811 \
doc/loncapafiles/loncapafiles.lpml:1.812
--- doc/loncapafiles/loncapafiles.lpml:1.811 Wed Sep 26 09:20:21 2012
+++ doc/loncapafiles/loncapafiles.lpml Fri Oct 5 15:36:21 2012
@@ -2,7 +2,7 @@
"http://lpml.sourceforge.net/DTD/lpml.dtd">
<!-- loncapafiles.lpml -->
-<!-- $Id: loncapafiles.lpml,v 1.811 2012/09/26 09:20:21 raeburn Exp $ -->
+<!-- $Id: loncapafiles.lpml,v 1.812 2012/10/05 15:36:21 raeburn Exp $ -->
<!--
@@ -259,7 +259,7 @@
<protectionlevel>never_delete</protectionlevel>
<targetdir dist='default'>etc/httpd/conf</targetdir>
<targetdir dist='suse9.2 suse9.3 sles9'>etc/httpd</targetdir>
- <targetdir dist='debian5 debian6 ubuntu6 ubuntu8 ubuntu10 ubuntu12 suse9.2 suse9.3 \
sles9 sles10 sles11 suse10.1 suse10.2 suse10.3 suse11.1 suse11.2 suse11.3 suse11.4 \
suse12.1'>etc/apache2</targetdir> + <targetdir dist='debian5 debian6 ubuntu6 ubuntu8 \
ubuntu10 ubuntu12 suse9.2 suse9.3 sles9 sles10 sles11 suse10.1 suse10.2 suse10.3 \
suse11.1 suse11.2 suse11.3 suse11.4 suse12.1 suse12.2'>etc/apache2</targetdir> \
<categoryname>standard</categoryname> <description>web configuration \
files</description> </directory>
@@ -267,7 +267,7 @@
<protectionlevel>modest_delete</protectionlevel>
<targetdir dist='default'>etc/httpd/conf/rewrites</targetdir>
<targetdir dist='suse9.2 suse9.3 sles9'>etc/httpd/rewrites</targetdir>
- <targetdir dist='debian5 debian6 ubuntu6 ubuntu8 ubuntu10 ubuntu12 suse9.2 suse9.3 \
sles9 sles10 sles11 suse10.1 suse10.2 suse10.3 suse11.1 suse11.2 suse11.3 suse11.4 \
suse12.1'>etc/apache2/rewrites</targetdir> + <targetdir dist='debian5 debian6 \
ubuntu6 ubuntu8 ubuntu10 ubuntu12 suse9.2 suse9.3 sles9 sles10 sles11 suse10.1 \
suse10.2 suse10.3 suse11.1 suse11.2 suse11.3 suse11.4 suse12.1 \
suse12.2'>etc/apache2/rewrites</targetdir> <categoryname>standard</categoryname>
<description>
default configuration files to enable/disable http:// -> https:// rewrites
@@ -283,56 +283,56 @@
<directory dist='default'>
<protectionlevel>never_delete</protectionlevel>
<targetdir dist='default'>etc/rc.d/init.d</targetdir>
- <targetdir dist='debian5 debian6 ubuntu6 ubuntu8 ubuntu10 ubuntu12 suse9.2 suse9.3 \
sles9 sles10 sles11 suse10.1 suse10.2 suse10.3 suse11.1 suse11.2 suse11.3 suse11.4 \
suse12.1'>etc/init.d</targetdir> + <targetdir dist='debian5 debian6 ubuntu6 ubuntu8 \
ubuntu10 ubuntu12 suse9.2 suse9.3 sles9 sles10 sles11 suse10.1 suse10.2 suse10.3 \
suse11.1 suse11.2 suse11.3 suse11.4 suse12.1 suse12.2'>etc/init.d</targetdir> \
<categoryname>standard</categoryname> <description>scripts that run during system \
startup</description> </directory>
<directory dist='default'>
<protectionlevel>never_delete</protectionlevel>
<targetdir dist='default'>etc/rc.d/rc0.d</targetdir>
- <targetdir dist='debian5 debian6 ubuntu6 ubuntu8 ubuntu10 ubuntu12 suse9.2 suse9.3 \
sles9 sles10 sles11 suse10.1 suse10.2 suse10.3 suse11.1 suse11.2 suse11.3 suse11.4 \
suse12.1'>etc/rc0.d</targetdir> + <targetdir dist='debian5 debian6 ubuntu6 ubuntu8 \
ubuntu10 ubuntu12 suse9.2 suse9.3 sles9 sles10 sles11 suse10.1 suse10.2 suse10.3 \
suse11.1 suse11.2 suse11.3 suse11.4 suse12.1 suse12.2'>etc/rc0.d</targetdir> \
<categoryname>standard</categoryname> <description>scripts that run for run-level \
0</description> </directory>
<directory dist='default'>
<protectionlevel>never_delete</protectionlevel>
<targetdir dist='default'>etc/rc.d/rc1.d</targetdir>
- <targetdir dist='debian5 debian6 ubuntu6 ubuntu8 ubuntu10 ubuntu12 suse9.2 suse9.3 \
sles9 sles10 sles11 suse10.1 suse10.2 suse10.3 suse11.1 suse11.2 suse11.3 suse11.4 \
suse12.1'>etc/rc1.d</targetdir> + <targetdir dist='debian5 debian6 ubuntu6 ubuntu8 \
ubuntu10 ubuntu12 suse9.2 suse9.3 sles9 sles10 sles11 suse10.1 suse10.2 suse10.3 \
suse11.1 suse11.2 suse11.3 suse11.4 suse12.1 suse12.2'>etc/rc1.d</targetdir> \
<categoryname>standard</categoryname> <description>scripts that run for run-level \
1</description> </directory>
<directory dist='default'>
<protectionlevel>never_delete</protectionlevel>
<targetdir dist='default'>etc/rc.d/rc2.d</targetdir>
- <targetdir dist='debian5 debian6 ubuntu6 ubuntu8 ubuntu10 ubuntu12 suse9.2 suse9.3 \
sles9 sles10 sles11 suse10.1 suse10.2 suse10.3 suse11.1 suse11.2 suse11.3 suse11.4 \
suse12.1'>etc/rc2.d</targetdir> + <targetdir dist='debian5 debian6 ubuntu6 ubuntu8 \
ubuntu10 ubuntu12 suse9.2 suse9.3 sles9 sles10 sles11 suse10.1 suse10.2 suse10.3 \
suse11.1 suse11.2 suse11.3 suse11.4 suse12.1 suse12.2'>etc/rc2.d</targetdir> \
<categoryname>standard</categoryname> <description>scripts that run for run-level \
2</description> </directory>
<directory dist='default'>
<protectionlevel>never_delete</protectionlevel>
<targetdir dist='default'>etc/rc.d/rc3.d</targetdir>
- <targetdir dist='debian5 debian6 ubuntu6 ubuntu8 ubuntu10 ubuntu12 suse9.2 suse9.3 \
sles9 sles10 sles11 suse10.1 suse10.2 suse10.3 suse11.1 suse11.2 suse11.3 suse11.4 \
suse12.1'>etc/rc3.d</targetdir> + <targetdir dist='debian5 debian6 ubuntu6 ubuntu8 \
ubuntu10 ubuntu12 suse9.2 suse9.3 sles9 sles10 sles11 suse10.1 suse10.2 suse10.3 \
suse11.1 suse11.2 suse11.3 suse11.4 suse12.1 suse12.2'>etc/rc3.d</targetdir> \
<categoryname>standard</categoryname> <description>scripts that run for run-level \
3</description> </directory>
<directory dist='default'>
<protectionlevel>never_delete</protectionlevel>
<targetdir dist='default'>etc/rc.d/rc4.d</targetdir>
- <targetdir dist='debian5 debian6 ubuntu6 ubuntu8 ubuntu10 ubuntu12 suse9.2 suse9.3 \
sles9 sles10 sles11 suse10.1 suse10.2 suse10.3 suse11.1 suse11.2 suse11.3 suse11.4 \
suse12.1'>etc/rc4.d</targetdir> + <targetdir dist='debian5 debian6 ubuntu6 ubuntu8 \
ubuntu10 ubuntu12 suse9.2 suse9.3 sles9 sles10 sles11 suse10.1 suse10.2 suse10.3 \
suse11.1 suse11.2 suse11.3 suse11.4 suse12.1 suse12.2'>etc/rc4.d</targetdir> \
<categoryname>standard</categoryname> <description>scripts that run for run-level \
4</description> </directory>
<directory dist='default'>
<protectionlevel>never_delete</protectionlevel>
<targetdir dist='default'>etc/rc.d/rc5.d</targetdir>
- <targetdir dist='debian5 debian6 ubuntu6 ubuntu8 ubuntu10 ubuntu12 suse9.2 suse9.3 \
sles9 sles10 sles11 suse10.1 suse10.2 suse10.3 suse11.1 suse11.2 suse11.3 suse11.4 \
suse12.1'>etc/rc5.d</targetdir> + <targetdir dist='debian5 debian6 ubuntu6 ubuntu8 \
ubuntu10 ubuntu12 suse9.2 suse9.3 sles9 sles10 sles11 suse10.1 suse10.2 suse10.3 \
suse11.1 suse11.2 suse11.3 suse11.4 suse12.1 suse12.2'>etc/rc5.d</targetdir> \
<categoryname>standard</categoryname> <description>scripts that run for run-level \
5</description> </directory>
<directory dist='default'>
<protectionlevel>never_delete</protectionlevel>
<targetdir dist='default'>etc/rc.d/rc6.d</targetdir>
- <targetdir dist='debian5 debian6 ubuntu6 ubuntu8 ubuntu10 ubuntu12 suse9.2 suse9.3 \
sles9 sles10 sles11 suse10.1 suse10.2 suse10.3 suse11.1 suse11.2 suse11.3 suse11.4 \
suse12.1'>etc/rc6.d</targetdir> + <targetdir dist='debian5 debian6 ubuntu6 ubuntu8 \
ubuntu10 ubuntu12 suse9.2 suse9.3 sles9 sles10 sles11 suse10.1 suse10.2 suse10.3 \
suse11.1 suse11.2 suse11.3 suse11.4 suse12.1 suse12.2'>etc/rc6.d</targetdir> \
<categoryname>standard</categoryname> <description>scripts that run for run-level \
6</description> </directory>
@@ -1029,7 +1029,7 @@
<file>
<source>loncom/loncapa.conf</source>
<target dist='default'>etc/httpd/conf/loncapa.conf</target>
-<target dist='sles10 sles11 suse10.1 suse10.2 suse10.3 suse11.1 suse11.2 suse11.3 \
suse11.4 suse12.1 debian5 debian6 ubuntu6 ubuntu8 ubuntu10 \
ubuntu12'>etc/apache2/loncapa.conf</target> +<target dist='sles10 sles11 suse10.1 \
suse10.2 suse10.3 suse11.1 suse11.2 suse11.3 suse11.4 suse12.1 suse12.2 debian5 \
debian6 ubuntu6 ubuntu8 ubuntu10 ubuntu12'>etc/apache2/loncapa.conf</target> \
<categoryname>conf</categoryname> <description>
<p>
@@ -1072,7 +1072,7 @@
<file type="postaboutversion">
<source>loncom/loncapa_apache.conf</source>
<target dist='default'>etc/httpd/conf/loncapa_apache.conf</target>
-<target dist='sles10 sles11 suse10.1 suse10.2 suse10.3 suse11.1 suse11.2 suse11.3 \
suse11.4 suse12.1 debian5 debian6 ubuntu6 ubuntu8 ubuntu10 \
ubuntu12'>etc/apache2/loncapa_apache.conf</target> +<target dist='sles10 sles11 \
suse10.1 suse10.2 suse10.3 suse11.1 suse11.2 suse11.3 suse11.4 suse12.1 suse12.2 \
debian5 debian6 ubuntu6 ubuntu8 ubuntu10 \
ubuntu12'>etc/apache2/loncapa_apache.conf</target> <categoryname>static \
conf</categoryname> <description>
The goal of this file is to implement all LON-CAPA specific
@@ -1092,7 +1092,7 @@
<file>
<source>loncom/startup.pl</source>
<target dist='default'>etc/httpd/conf/startup.pl</target>
-<target dist='sles10 sles11 suse10.1 suse10.2 suse10.3 suse11.1 suse11.2 suse11.3 \
suse11.4 suse12.1 debian5 debian6 ubuntu6 ubuntu8 ubuntu10 \
ubuntu12'>etc/apache2/startup.pl</target> +<target dist='sles10 sles11 suse10.1 \
suse10.2 suse10.3 suse11.1 suse11.2 suse11.3 suse11.4 suse12.1 suse12.2 debian5 \
debian6 ubuntu6 ubuntu8 ubuntu10 ubuntu12'>etc/apache2/startup.pl</target> \
<categoryname>static conf</categoryname> <description>
This file provides initializations for perl handlers. It adjusts what
@@ -1114,7 +1114,7 @@
<file>
<source>loncom/rewrites/loncapa_rewrite_off.conf</source>
<target dist='default'>etc/httpd/conf/loncapa_rewrite.conf</target>
-<target dist='sles10 sles11 suse10.1 suse10.2 suse10.3 suse11.1 suse11.2 suse11.3 \
suse11.4 suse12.1 debian5 debian6 ubuntu6 ubuntu8 ubuntu10 \
ubuntu12'>etc/apache2/loncapa_rewrite.conf</target> +<target dist='sles10 sles11 \
suse10.1 suse10.2 suse10.3 suse11.1 suse11.2 suse11.3 suse11.4 suse12.1 suse12.2 \
debian5 debian6 ubuntu6 ubuntu8 ubuntu10 \
ubuntu12'>etc/apache2/loncapa_rewrite.conf</target> \
<categoryname>conf</categoryname> <description>
Default rewrite file.
@@ -1126,7 +1126,7 @@
<source>loncom/rewrites/loncapa_rewrite_on.conf</source>
<target dist='default'>etc/httpd/conf/rewrites/loncapa_rewrite_on.conf</target>
<target dist='sles9'>etc/apache/rewrites/loncapa_rewrite_on.conf</target>
-<target dist='sles10 sles11 suse10.1 suse10.2 suse10.3 suse11.1 suse11.2 suse11.3 \
suse11.4 suse12.1 debian5 debian6 ubuntu6 ubuntu8 ubuntu10 \
ubuntu12'>etc/apache2/rewrites/loncapa_rewrite_on.conf</target> +<target dist='sles10 \
sles11 suse10.1 suse10.2 suse10.3 suse11.1 suse11.2 suse11.3 suse11.4 suse12.1 \
suse12.2 debian5 debian6 ubuntu6 ubuntu8 ubuntu10 \
ubuntu12'>etc/apache2/rewrites/loncapa_rewrite_on.conf</target> <categoryname>static \
conf</categoryname> <description>
File to copy to /etc/apache2/loncapa_rewrite.conf (SuSE/SLES/Debian/Ubuntu LTS) or \
to /etc/httpd/conf/loncapa_rewrite.conf to enable rewriting of @@ -1137,7 +1137,7 @@
<source>loncom/rewrites/loncapa_rewrite_off.conf</source>
<target dist='default'>etc/httpd/conf/rewrites/loncapa_rewrite_off.conf</target>
<target dist='sles9'>etc/apache/rewrites/loncapa_rewrite_off.conf</target>
-<target dist='sles10 sles11 suse10.1 suse10.2 suse10.3 suse11.1 suse11.2 suse11.3 \
suse11.4 suse12.1 debian5 debian6 ubuntu6 ubuntu8 ubuntu10 \
ubuntu12'>etc/apache2/rewrites/loncapa_rewrite_off.conf</target> +<target \
dist='sles10 sles11 suse10.1 suse10.2 suse10.3 suse11.1 suse11.2 suse11.3 suse11.4 \
suse12.1 suse12.2 debian5 debian6 ubuntu6 ubuntu8 ubuntu10 \
ubuntu12'>etc/apache2/rewrites/loncapa_rewrite_off.conf</target> \
<categoryname>static conf</categoryname> <description>
File to copy to /etc/apache2/loncapa_rewrite.conf (SuSE/SLES/Debian/Ubuntu LTS) or \
to /etc/httpd/conf/loncapa_rewrite.conf to disable rewriting of @@ -6330,7 +6330,7 \
@@ <file>
<source>loncom/mime.types</source>
<target dist='default'>etc/httpd/conf/mime.types</target>
-<target dist='sles10 sles11 suse10.1 suse10.2 suse10.3 suse11.1 suse11.2 suse11.3 \
suse11.4 suse12.1 debian5 debian6 ubuntu6 ubuntu8 ubuntu10 \
ubuntu12'>etc/apache2/mime.types</target> +<target dist='sles10 sles11 suse10.1 \
suse10.2 suse10.3 suse11.1 suse11.2 suse11.3 suse11.4 suse12.1 suse12.2 debian5 \
debian6 ubuntu6 ubuntu8 ubuntu10 ubuntu12'>etc/apache2/mime.types</target> \
<categoryname>www static conf</categoryname> <description>Expanded \
mime.types</description> </file>
@@ -7871,7 +7871,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 sles11 suse10.1 suse10.2 suse10.3 \
suse11.1 suse11.2 suse11.3 suse11.4 suse12.1 debian5 debian6 ubuntu6 ubuntu8 ubuntu10 \
ubuntu12'>etc/init.d/loncontrol</target> +<target dist='suse9.2 suse9.3 sles9 sles10 \
sles11 suse10.1 suse10.2 suse10.3 suse11.1 suse11.2 suse11.3 suse11.4 suse12.1 \
suse12.2 debian5 debian6 ubuntu6 ubuntu8 ubuntu10 \
ubuntu12'>etc/init.d/loncontrol</target> <categoryname>root script</categoryname>
<description>
Controls the launching/halting of lonc, lond, and lonsql processes.
@@ -7879,7 +7879,7 @@
</file>
<link>
<linkto dist='default'>etc/rc.d/init.d/loncontrol</linkto>
-<linkto dist='suse9.2 suse9.3 sles9 sles10 sles11 suse10.1 suse10.2 suse10.3 \
suse11.1 suse11.2 suse11.3 suse11.4 suse12.1 debian5 debian6 ubuntu6 ubuntu8 ubuntu10 \
ubuntu12'>etc/init.d/loncontrol</linkto> +<linkto dist='suse9.2 suse9.3 sles9 sles10 \
sles11 suse10.1 suse10.2 suse10.3 suse11.1 suse11.2 suse11.3 suse11.4 suse12.1 \
suse12.2 debian5 debian6 ubuntu6 ubuntu8 ubuntu10 \
ubuntu12'>etc/init.d/loncontrol</linkto> <target dist='default'>
etc/rc.d/rc0.d/K05loncontrol;
etc/rc.d/rc1.d/K05loncontrol;
@@ -7889,7 +7889,7 @@
etc/rc.d/rc5.d/S95loncontrol;
etc/rc.d/rc6.d/K05loncontrol
</target>
-<target='suse9.2 suse9.3 sles9 sles10 sles11 suse10.1 suse10.2 suse10.3 suse11.1 \
suse11.2 suse11.3 suse11.4 suse12.1'> +<target='suse9.2 suse9.3 sles9 sles10 sles11 \
suse10.1 suse10.2 suse10.3 suse11.1 suse11.2 suse11.3 suse11.4 suse12.1 suse12.2'> \
etc/rc.d/rc0.d/K05loncontrol; etc/rc.d/rc1.d/K05loncontrol;
etc/rc.d/rc2.d/K05loncontrol;
@@ -7912,13 +7912,13 @@
</description>
</link>
-<file dist="suse9.2 suse9.3 suse10.2 suse10.3 suse11.1 suse11.2 suse11.3 suse11.4 \
suse12.1 sles9 sles10 sles11"> +<file dist="suse9.2 suse9.3 suse10.2 suse10.3 \
suse11.1 suse11.2 suse11.3 suse11.4 suse12.1 suse12.2 sles9 sles10 sles11"> \
<source>loncom/init.d/loncontrol</source> <target>etc/rc.d/</target>
<description>
setup loncontrol to run at boot
</description>
- <installscript dist="suse9.2 suse9.3 suse10.2 suse10.3 suse11.1 suse11.2 suse11.3 \
suse11.4 suse12.1 sles9 sles10 sles11"> + <installscript dist="suse9.2 suse9.3 \
suse10.2 suse10.3 suse11.1 suse11.2 suse11.3 suse11.4 suse12.1 suse12.2 sles9 sles10 \
sles11">
-c 'chkconfig --del loncontrol;chkconfig loncontrol 35;chkconfig --list loncontrol'
</installscript>
<dependencies>
Index: doc/loncapafiles/modify_config_files.piml
diff -u doc/loncapafiles/modify_config_files.piml:1.19 \
doc/loncapafiles/modify_config_files.piml:1.20
--- doc/loncapafiles/modify_config_files.piml:1.19 Mon Jul 30 01:37:22 2012
+++ doc/loncapafiles/modify_config_files.piml Fri Oct 5 15:36:21 2012
@@ -3,7 +3,7 @@
<!-- modify_config_files.piml -->
<!-- Matthew Hall -->
-<!-- $Id: modify_config_files.piml,v 1.19 2012/07/30 01:37:22 raeburn Exp $ -->
+<!-- $Id: modify_config_files.piml,v 1.20 2012/10/05 15:36:21 raeburn Exp $ -->
<!--
@@ -37,7 +37,7 @@
<perlscript mode="fg">
my $configfiles = 'yum and MySQL';
my $mysqlcmd = '/etc/init.d/mysqld restart';
-if ('<DIST />' eq 'suse9.2' || '<DIST />' eq 'suse9.3' || '<DIST />' eq 'sles9' || \
'<DIST />' eq 'sles10' || '<DIST />' eq 'sles11' || '<DIST />' eq 'suse10.1' || \
'<DIST />' eq 'suse10.2' || '<DIST />' eq 'suse10.3' || '<DIST />' eq 'suse11.1' || \
'<DIST />' eq 'suse11.2' || '<DIST />' eq 'suse11.3' || '<DIST />' eq 'suse11.4' || \
'<DIST />' eq 'suse12.1') { +if ('<DIST />' eq 'suse9.2' || '<DIST />' eq 'suse9.3' \
|| '<DIST />' eq 'sles9' || '<DIST />' eq 'sles10' || '<DIST />' eq 'sles11' || \
'<DIST />' eq 'suse10.1' || '<DIST />' eq 'suse10.2' || '<DIST />' eq 'suse10.3' || \
'<DIST />' eq 'suse11.1' || '<DIST />' eq 'suse11.2' || '<DIST />' eq 'suse11.3' || \
'<DIST />' eq 'suse11.4' || '<DIST />' eq 'suse12.1' || '<DIST />' eq 'suse12.2') { \
$mysqlcmd = '/etc/init.d/mysql restart'; $configfiles = 'MySQL';
} elsif ('<DIST />' eq 'rhes4') {
Index: doc/loncapafiles/picins_check.piml
diff -u doc/loncapafiles/picins_check.piml:1.17 \
doc/loncapafiles/picins_check.piml:1.18
--- doc/loncapafiles/picins_check.piml:1.17 Mon Jul 30 01:37:22 2012
+++ doc/loncapafiles/picins_check.piml Fri Oct 5 15:36:21 2012
@@ -3,7 +3,7 @@
<!-- picins_check.piml -->
<!-- Stuart Raeburn -->
-<!-- $Id: picins_check.piml,v 1.17 2012/07/30 01:37:22 raeburn Exp $ -->
+<!-- $Id: picins_check.piml,v 1.18 2012/10/05 15:36:21 raeburn Exp $ -->
<!--
@@ -32,7 +32,7 @@
<piml>
<files>
<file>
-<perlscript mode="fg" dist="fedora9 fedora10 fedora11 fedora12 fedora13 fedora14 \
fedora15 fedora16 fedora17 rhes6 scientific6 centos6 sles11 suse11.1 suse11.2 \
suse11.3 suse11.4 suse12.1 debian5 debian6 ubuntu8 ubuntu10 ubuntu12"> +<perlscript \
mode="fg" dist="fedora9 fedora10 fedora11 fedora12 fedora13 fedora14 fedora15 \
fedora16 fedora17 rhes6 scientific6 centos6 sles11 suse11.1 suse11.2 suse11.3 \
suse11.4 suse12.1 suse12.2 debian5 debian6 ubuntu8 ubuntu10 ubuntu12"> 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.27 doc/loncapafiles/rpmcheck.piml:1.28
--- doc/loncapafiles/rpmcheck.piml:1.27 Tue Jul 24 04:20:50 2012
+++ doc/loncapafiles/rpmcheck.piml Fri Oct 5 15:36:21 2012
@@ -3,7 +3,7 @@
<!-- phpcheck.piml -->
<!-- Matthew Hall -->
-<!-- $Id: rpmcheck.piml,v 1.27 2012/07/24 04:20:50 raeburn Exp $ -->
+<!-- $Id: rpmcheck.piml,v 1.28 2012/10/05 15:36:21 raeburn Exp $ -->
<!--
@@ -81,7 +81,7 @@
}
}
</perlscript>
-<perlscript dist="fedora1 fedora2 fedora3 fedora4 fedora5 fedora6 fedora7 fedora8 \
fedora9 fedora10 fedora11 fedora12 fedora13 fedora14 fedora15 fedora16 fedora17 rhes5 \
rhes6 centos5 scientific5 scientific6 centos6 suse9.2 suse9.3 suse10.1 suse10.2 \
suse10.3 sles9 sles10 sles11 suse11.1 suse11.2 suse11.3 suse11.4 suse12.1" mode="fg"> \
+<perlscript dist="fedora1 fedora2 fedora3 fedora4 fedora5 fedora6 fedora7 fedora8 \
fedora9 fedora10 fedora11 fedora12 fedora13 fedora14 fedora15 fedora16 fedora17 rhes5 \
rhes6 centos5 scientific5 scientific6 centos6 suse9.2 suse9.3 suse10.1 suse10.2 \
suse10.3 sles9 sles10 sles11 suse11.1 suse11.2 suse11.3 suse11.4 suse12.1 suse12.2" \
mode="fg"> my $hasprereqs = 0;
if (open(PIPE,"rpm -q LONCAPA-prerequisites|")) {
my @lines = (<PIPE>);
Index: doc/loncapafiles/sanitycheck.piml
diff -u doc/loncapafiles/sanitycheck.piml:1.37 doc/loncapafiles/sanitycheck.piml:1.38
--- doc/loncapafiles/sanitycheck.piml:1.37 Mon Jul 30 01:37:22 2012
+++ doc/loncapafiles/sanitycheck.piml Fri Oct 5 15:36:21 2012
@@ -2,7 +2,7 @@
"http://lpml.sourceforge.net/DTD/piml.dtd">
<!-- sanitycheck.piml -->
-<!-- $Id: sanitycheck.piml,v 1.37 2012/07/30 01:37:22 raeburn Exp $ -->
+<!-- $Id: sanitycheck.piml,v 1.38 2012/10/05 15:36:21 raeburn Exp $ -->
<!--
@@ -60,7 +60,7 @@
</file>
<file>
<target dist='default'>/var/lib/mysql/mysql.sock</target>
-<target dist='suse11.2 suse11.3 suse11.4 \
suse12.1'>/var/run/mysql/mysql.sock</target> +<target dist='suse11.2 suse11.3 \
suse11.4 suse12.1 suse12.2'>/var/run/mysql/mysql.sock</target> <target dist='debian5 \
debian6 ubuntu6 ubuntu8 ubuntu10 ubuntu12'>/var/run/mysqld/mysqld.sock</target> \
<perlscript mode='fg'> unless
@@ -113,7 +113,7 @@
</file>
<file>
<target dist='default'>/etc/httpd/conf/loncapa.conf</target>
-<target dist='sles10 sles11 suse10.1 suse10.2 suse10.3 suse11.1 suse11.2 suse11.3 \
suse11.4 suse12.1 debian5 debian6 ubuntu6 ubuntu8 ubuntu10 \
ubuntu12'>/etc/apache2/loncapa.conf</target> +<target dist='sles10 sles11 suse10.1 \
suse10.2 suse10.3 suse11.1 suse11.2 suse11.3 suse11.4 suse12.1 suse12.2 debian5 \
debian6 ubuntu6 ubuntu8 ubuntu10 ubuntu12'>/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.74 doc/loncapafiles/updatequery.piml:1.75
--- doc/loncapafiles/updatequery.piml:1.74 Mon Jul 30 01:37:22 2012
+++ doc/loncapafiles/updatequery.piml Fri Oct 5 15:36:21 2012
@@ -1,6 +1,6 @@
<!-- updatequery.piml -->
-<!-- $Id: updatequery.piml,v 1.74 2012/07/30 01:37:22 raeburn Exp $ -->
+<!-- $Id: updatequery.piml,v 1.75 2012/10/05 15:36:21 raeburn Exp $ -->
<!--
@@ -546,7 +546,7 @@
# update loncapa.conf
my $confdir = '/etc/httpd/conf/';
-if ('<DIST />' eq 'sles10' || '<DIST />' eq 'sles11' || '<DIST />' eq 'suse10.1' || \
'<DIST />' eq 'suse10.2' || '<DIST />' eq 'suse10.3' || '<DIST />' eq 'suse11.1' || \
'<DIST />' eq 'suse11.2' || '<DIST />' eq 'suse11.3' || '<DIST />' eq 'suse11.4' || \
'<DIST />' eq 'suse12.1' || '<DIST />' eq 'debian5' || '<DIST />' eq 'debian6' || \
'<DIST />' eq 'ubuntu6' || '<DIST />' eq 'ubuntu8' || '<DIST />' eq 'ubuntu10' || \
'<DIST />' eq 'ubuntu12') { +if ('<DIST />' eq 'sles10' || '<DIST />' eq 'sles11' || \
'<DIST />' eq 'suse10.1' || '<DIST />' eq 'suse10.2' || '<DIST />' eq 'suse10.3' || \
'<DIST />' eq 'suse11.1' || '<DIST />' eq 'suse11.2' || '<DIST />' eq 'suse11.3' || \
'<DIST />' eq 'suse11.4' || '<DIST />' eq 'suse12.1' || '<DIST />' eq 'suse12.2' || \
'<DIST />' eq 'debian5' || '<DIST />' eq 'debian6' || '<DIST />' eq 'ubuntu6' || \
'<DIST />' eq 'ubuntu8' || '<DIST />' eq 'ubuntu10' || '<DIST />' eq 'ubuntu12') { \
$confdir = '/etc/apache2/'; }
my $filename='loncapa.conf';
@@ -603,7 +603,7 @@
</file>
<file>
<target dist='default'>/etc/httpd/conf/</target>
-<target dist='sles10 sles11 suse10.1 suse10.2 suse10.3 suse11.1 suse11.2 suse11.3 \
suse11.4 suse12.1 debian5 debian6 ubuntu6 ubuntu8 ubuntu10 \
ubuntu12'>/etc/apache2/</target> +<target dist='sles10 sles11 suse10.1 suse10.2 \
suse10.3 suse11.1 suse11.2 suse11.3 suse11.4 suse12.1 suse12.2 debian5 debian6 \
ubuntu6 ubuntu8 ubuntu10 ubuntu12'>/etc/apache2/</target> <perlscript mode='fg'>
sub securesetting {
my (%perlvar)=@_;
Index: doc/loncapafiles/webserver.piml
diff -u doc/loncapafiles/webserver.piml:1.34 doc/loncapafiles/webserver.piml:1.35
--- doc/loncapafiles/webserver.piml:1.34 Mon Jul 30 01:37:22 2012
+++ doc/loncapafiles/webserver.piml Fri Oct 5 15:36:22 2012
@@ -2,7 +2,7 @@
"http://lpml.sourceforge.net/DTD/piml.dtd">
<!-- webserver.piml -->
-<!-- $Id: webserver.piml,v 1.34 2012/07/30 01:37:22 raeburn Exp $ -->
+<!-- $Id: webserver.piml,v 1.35 2012/10/05 15:36:22 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 sles11 suse10.1 suse10.2 suse10.3 suse11.1 suse11.2 suse11.3 \
suse11.4 suse12.1'>/etc/apache2/default-server.conf</target> +<target dist='sles10 \
sles11 suse10.1 suse10.2 suse10.3 suse11.1 suse11.2 suse11.3 suse11.4 suse12.1 \
suse12.2'>/etc/apache2/default-server.conf</target> <target dist='debian5 debian6 \
ubuntu6 ubuntu8 ubuntu10 ubuntu12'>/etc/apache2/sites-available/loncapa</target> \
<note>This is for Apache 1.X for Red Hat 4ES, Fedora 2, 3 and 4, SusSE 9.2 and 9.3, \
and SLES 9 distributions. This is for Apache 2.X for Fedora 5, Red Hat 5, CentOS 5, \
Scientific Linux 5, SuSE 10.1, SLES 10, Debian 5, Ubuntu LTS 8 and later \
distributions</note> <dependencies dist='default'>
@@ -58,7 +58,7 @@
<dependencies dist='debian5 debian6 ubuntu6 ubuntu8 ubuntu10 ubuntu12'>
/etc/apache2/sites-available/loncapa
</dependencies>
-<dependencies dist='sles10 sles11 suse10.1 suse10.2 suse10.3 suse11.1 suse11.2 \
suse11.3 suse11.4 suse12.1'> +<dependencies dist='sles10 sles11 suse10.1 suse10.2 \
suse10.3 suse11.1 suse11.2 suse11.3 suse11.4 suse12.1 suse12.2'> \
/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.18 doc/loncapafiles/wrap_setuid.piml:1.19
--- doc/loncapafiles/wrap_setuid.piml:1.18 Mon Jul 30 01:37:22 2012
+++ doc/loncapafiles/wrap_setuid.piml Fri Oct 5 15:36:22 2012
@@ -3,7 +3,7 @@
<!-- wrap_setuid.piml -->
<!-- Guy Albertelli -->
-<!-- $Id: wrap_setuid.piml,v 1.18 2012/07/30 01:37:22 raeburn Exp $ -->
+<!-- $Id: wrap_setuid.piml,v 1.19 2012/10/05 15:36:22 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 sles11 suse10.1 suse10.2 \
suse10.3 suse11.1 suse11.2 suse11.3 suse11.4 suse12.1 fedora14 fedora15 fedora16 \
fedora17 ubuntu12"> +<perlscript mode="fg" dist="suse9.2 suse9.3 sles9 sles10 sles11 \
suse10.1 suse10.2 suse10.3 suse11.1 suse11.2 suse11.3 suse11.4 suse12.1 suse12.2 \
fedora14 fedora15 fedora16 fedora17 ubuntu12">
$fslist='<TARGET />';
open(FIND, "find <TARGET /> -xdev -type f \\( -perm -04000 -o -perm -02000 \\) \
-print|");
_______________________________________________
LON-CAPA-cvs mailing list
LON-CAPA-cvs@mail.lon-capa.org
http://mail.lon-capa.org/mailman/listinfo/lon-capa-cvs
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic