[LON-CAPA-cvs] cvs: doc /loncapafiles chkconfig.piml loncapafiles.lpml modify_config_files.piml picins_check.piml sanitycheck.piml updatequery.piml verify_domconfiguser.piml webserver.piml wrap_setuid.piml
raeburn
raeburn at source.lon-capa.org
Thu Apr 4 11:06:40 EDT 2013
raeburn Thu Apr 4 15:06:40 2013 EDT
Modified files:
/doc/loncapafiles chkconfig.piml loncapafiles.lpml
modify_config_files.piml picins_check.piml
sanitycheck.piml updatequery.piml
verify_domconfiguser.piml webserver.piml
wrap_setuid.piml
Log:
- Support SuSE 12.3
-------------- next part --------------
Index: doc/loncapafiles/chkconfig.piml
diff -u doc/loncapafiles/chkconfig.piml:1.25 doc/loncapafiles/chkconfig.piml:1.26
--- doc/loncapafiles/chkconfig.piml:1.25 Sun Jan 6 23:10:50 2013
+++ doc/loncapafiles/chkconfig.piml Thu Apr 4 15:06:39 2013
@@ -3,7 +3,7 @@
<!-- checkconfig.piml -->
<!-- Matthew Hall -->
-<!-- $Id: chkconfig.piml,v 1.25 2013/01/06 23:10:50 raeburn Exp $ -->
+<!-- $Id: chkconfig.piml,v 1.26 2013/04/04 15:06:39 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' || '<DIST />' eq 'suse12.2') {
+} 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' || '<DIST />' eq 'suse12.3') {
$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') {
@@ -56,7 +56,7 @@
}
if (('<DIST />' eq 'fedora16') || ('<DIST />' eq 'fedora17') ||
('<DIST />' eq 'fedora18') || ('<DIST />' eq 'suse12.1') ||
- ('<DIST />' eq 'suse12.2')) {
+ ('<DIST />' eq 'suse12.2') || ('<DIST />' eq 'suse12.3')) {
$use_systemctl = 1;
}
exit if (! -x $checker_bin);
Index: doc/loncapafiles/loncapafiles.lpml
diff -u doc/loncapafiles/loncapafiles.lpml:1.829 doc/loncapafiles/loncapafiles.lpml:1.830
--- doc/loncapafiles/loncapafiles.lpml:1.829 Mon Mar 18 02:57:21 2013
+++ doc/loncapafiles/loncapafiles.lpml Thu Apr 4 15:06:39 2013
@@ -2,7 +2,7 @@
"http://lpml.sourceforge.net/DTD/lpml.dtd">
<!-- loncapafiles.lpml -->
-<!-- $Id: loncapafiles.lpml,v 1.829 2013/03/18 02:57:21 raeburn Exp $ -->
+<!-- $Id: loncapafiles.lpml,v 1.830 2013/04/04 15:06:39 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 suse12.2'>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 suse12.3'>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 suse12.2'>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 suse12.3'>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 suse12.2'>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 suse12.3'>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 suse12.2'>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 suse12.3'>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 suse12.2'>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 suse12.3'>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 suse12.2'>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 suse12.3'>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 suse12.2'>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 suse12.3'>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 suse12.2'>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 suse12.3'>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 suse12.2'>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 suse12.3'>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 suse12.2'>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 suse12.3'>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 suse12.2 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 suse12.3 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 suse12.2 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 suse12.3 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/loncapa_apache_local.conf</source>
<target dist='default'>etc/httpd/conf/loncapa_apache_local.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/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 suse12.3 debian5 debian6 ubuntu6 ubuntu8 ubuntu10 ubuntu12'>etc/apache2/startup.pl</target>
<categoryname>static conf</categoryname>
<description>
Documentation file describing how to add domain-specific Apache configuration
@@ -1105,7 +1105,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 suse12.2 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 suse12.3 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
@@ -1127,7 +1127,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 suse12.2 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 suse12.3 debian5 debian6 ubuntu6 ubuntu8 ubuntu10 ubuntu12'>etc/apache2/loncapa_rewrite.conf</target>
<categoryname>conf</categoryname>
<description>
Default rewrite file.
@@ -1139,7 +1139,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 suse12.2 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 suse12.3 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
@@ -1150,7 +1150,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 suse12.2 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 suse12.3 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
@@ -6413,7 +6413,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 suse12.2 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 suse12.3 debian5 debian6 ubuntu6 ubuntu8 ubuntu10 ubuntu12'>etc/apache2/mime.types</target>
<categoryname>www static conf</categoryname>
<description>Expanded mime.types</description>
</file>
@@ -7956,7 +7956,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 suse12.2 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 suse12.3 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.
@@ -7964,7 +7964,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 suse12.2 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 suse12.3 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;
@@ -7974,7 +7974,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 suse12.2'>
+<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 suse12.3'>
etc/rc.d/rc0.d/K05loncontrol;
etc/rc.d/rc1.d/K05loncontrol;
etc/rc.d/rc2.d/K05loncontrol;
@@ -7997,13 +7997,13 @@
</description>
</link>
-<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">
+<file dist="suse9.2 suse9.3 suse10.2 suse10.3 suse11.1 suse11.2 suse11.3 suse11.4 suse12.1 suse12.2 suse12.3 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 suse12.2 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 suse12.3 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.21 doc/loncapafiles/modify_config_files.piml:1.22
--- doc/loncapafiles/modify_config_files.piml:1.21 Sun Jan 6 23:10:50 2013
+++ doc/loncapafiles/modify_config_files.piml Thu Apr 4 15:06:39 2013
@@ -3,7 +3,7 @@
<!-- modify_config_files.piml -->
<!-- Matthew Hall -->
-<!-- $Id: modify_config_files.piml,v 1.21 2013/01/06 23:10:50 raeburn Exp $ -->
+<!-- $Id: modify_config_files.piml,v 1.22 2013/04/04 15:06:39 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' || '<DIST />' eq 'suse12.2') {
+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' || '<DIST />' eq 'suse12.3') {
$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.19 doc/loncapafiles/picins_check.piml:1.20
--- doc/loncapafiles/picins_check.piml:1.19 Sun Jan 6 23:10:50 2013
+++ doc/loncapafiles/picins_check.piml Thu Apr 4 15:06:40 2013
@@ -3,7 +3,7 @@
<!-- picins_check.piml -->
<!-- Stuart Raeburn -->
-<!-- $Id: picins_check.piml,v 1.19 2013/01/06 23:10:50 raeburn Exp $ -->
+<!-- $Id: picins_check.piml,v 1.20 2013/04/04 15:06:40 raeburn Exp $ -->
<!--
@@ -32,7 +32,7 @@
<piml>
<files>
<file>
-<perlscript mode="fg" dist="fedora9 fedora10 fedora11 fedora12 fedora13 fedora14 fedora15 fedora16 fedora17 fedora18 rhes6 scientific6 centos6 sles11 suse11.1 suse11.2 suse11.3 suse11.4 suse12.1 suse12.2 debian5 debian6 ubuntu8 ubuntu10 ubuntu12">
+<perlscript mode="fg" dist="fedora9 fedora10 fedora11 fedora12 fedora13 fedora14 fedora15 fedora16 fedora17 fedora18 rhes6 scientific6 centos6 sles11 suse11.1 suse11.2 suse11.3 suse11.4 suse12.1 suse12.2 suse12.3 debian5 debian6 ubuntu8 ubuntu10 ubuntu12">
my $picinspath = '/usr/share/texmf/tex/latex/picins';
my $file = 'picins.sty';
if (!-e "$picinspath/$file") {
Index: doc/loncapafiles/sanitycheck.piml
diff -u doc/loncapafiles/sanitycheck.piml:1.38 doc/loncapafiles/sanitycheck.piml:1.39
--- doc/loncapafiles/sanitycheck.piml:1.38 Fri Oct 5 15:36:21 2012
+++ doc/loncapafiles/sanitycheck.piml Thu Apr 4 15:06:40 2013
@@ -2,7 +2,7 @@
"http://lpml.sourceforge.net/DTD/piml.dtd">
<!-- sanitycheck.piml -->
-<!-- $Id: sanitycheck.piml,v 1.38 2012/10/05 15:36:21 raeburn Exp $ -->
+<!-- $Id: sanitycheck.piml,v 1.39 2013/04/04 15:06:40 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 suse12.2'>/var/run/mysql/mysql.sock</target>
+<target dist='suse11.2 suse11.3 suse11.4 suse12.1 suse12.2 suse12.3'>/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 suse12.2 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 suse12.3 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.75 doc/loncapafiles/updatequery.piml:1.76
--- doc/loncapafiles/updatequery.piml:1.75 Fri Oct 5 15:36:21 2012
+++ doc/loncapafiles/updatequery.piml Thu Apr 4 15:06:40 2013
@@ -1,6 +1,6 @@
<!-- updatequery.piml -->
-<!-- $Id: updatequery.piml,v 1.75 2012/10/05 15:36:21 raeburn Exp $ -->
+<!-- $Id: updatequery.piml,v 1.76 2013/04/04 15:06:40 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 'suse12.2' || '<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 'suse12.3' || '<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 suse12.2 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 suse12.3 debian5 debian6 ubuntu6 ubuntu8 ubuntu10 ubuntu12'>/etc/apache2/</target>
<perlscript mode='fg'>
sub securesetting {
my (%perlvar)=@_;
Index: doc/loncapafiles/verify_domconfiguser.piml
diff -u doc/loncapafiles/verify_domconfiguser.piml:1.13 doc/loncapafiles/verify_domconfiguser.piml:1.14
--- doc/loncapafiles/verify_domconfiguser.piml:1.13 Sat Oct 6 18:23:11 2012
+++ doc/loncapafiles/verify_domconfiguser.piml Thu Apr 4 15:06:40 2013
@@ -3,7 +3,7 @@
<!-- verify_domconfiguser.piml -->
<!-- Stuart Raeburn -->
-<!-- $Id: verify_domconfiguser.piml,v 1.13 2012/10/06 18:23:11 raeburn Exp $ -->
+<!-- $Id: verify_domconfiguser.piml,v 1.14 2013/04/04 15:06:40 raeburn Exp $ -->
<!--
@@ -40,7 +40,7 @@
my @conffiles = ('loncapa.conf','loncapa_apache.conf');
my %perlvar;
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 'suse12.2' || '<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 'suse12.3' || '<DIST />' eq 'debian5' || '<DIST />' eq 'debian6' || '<DIST />' eq 'ubuntu6' || '<DIST />' eq 'ubuntu8' || '<DIST />' eq 'ubuntu10' || '<DIST />' eq 'ubuntu12') {
$confdir = '/etc/apache2/';
}
foreach my $filename (@conffiles) {
Index: doc/loncapafiles/webserver.piml
diff -u doc/loncapafiles/webserver.piml:1.35 doc/loncapafiles/webserver.piml:1.36
--- doc/loncapafiles/webserver.piml:1.35 Fri Oct 5 15:36:22 2012
+++ doc/loncapafiles/webserver.piml Thu Apr 4 15:06:40 2013
@@ -2,7 +2,7 @@
"http://lpml.sourceforge.net/DTD/piml.dtd">
<!-- webserver.piml -->
-<!-- $Id: webserver.piml,v 1.35 2012/10/05 15:36:22 raeburn Exp $ -->
+<!-- $Id: webserver.piml,v 1.36 2013/04/04 15:06:40 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 suse12.2'>/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 suse12.3'>/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 suse12.2'>
+<dependencies dist='sles10 sles11 suse10.1 suse10.2 suse10.3 suse11.1 suse11.2 suse11.3 suse11.4 suse12.1 suse12.2 suse12.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.20 doc/loncapafiles/wrap_setuid.piml:1.21
--- doc/loncapafiles/wrap_setuid.piml:1.20 Sun Jan 6 23:10:50 2013
+++ doc/loncapafiles/wrap_setuid.piml Thu Apr 4 15:06:40 2013
@@ -3,7 +3,7 @@
<!-- wrap_setuid.piml -->
<!-- Guy Albertelli -->
-<!-- $Id: wrap_setuid.piml,v 1.20 2013/01/06 23:10:50 raeburn Exp $ -->
+<!-- $Id: wrap_setuid.piml,v 1.21 2013/04/04 15:06:40 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 suse12.2 fedora14 fedora15 fedora16 fedora17 fedora18 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 suse12.3 fedora14 fedora15 fedora16 fedora17 fedora18 ubuntu12">
$fslist='<TARGET />';
open(FIND, "find <TARGET /> -xdev -type f \\( -perm -04000 -o -perm -02000 \\) -print|");
More information about the LON-CAPA-cvs
mailing list