[LON-CAPA-cvs] cvs: doc /loncapafiles chkconfig.piml langcheck.piml loncapafiles.lpml modify_config_files.piml ntpcheck.piml picins_check.piml sanitycheck.piml updatequery.piml verify_domconfiguser.piml webserver.piml wrap_setuid.piml
raeburn
raeburn at source.lon-capa.org
Sun Jul 29 21:37:22 EDT 2012
raeburn Mon Jul 30 01:37:22 2012 EDT
Modified files:
/doc/loncapafiles chkconfig.piml langcheck.piml loncapafiles.lpml
modify_config_files.piml ntpcheck.piml
picins_check.piml sanitycheck.piml
updatequery.piml verify_domconfiguser.piml
webserver.piml wrap_setuid.piml
Log:
- Support Ubuntu 12.04 LTS.
-------------- next part --------------
Index: doc/loncapafiles/chkconfig.piml
diff -u doc/loncapafiles/chkconfig.piml:1.22 doc/loncapafiles/chkconfig.piml:1.23
--- doc/loncapafiles/chkconfig.piml:1.22 Tue Jul 24 04:20:50 2012
+++ doc/loncapafiles/chkconfig.piml Mon Jul 30 01:37:22 2012
@@ -3,7 +3,7 @@
<!-- checkconfig.piml -->
<!-- Matthew Hall -->
-<!-- $Id: chkconfig.piml,v 1.22 2012/07/24 04:20:50 raeburn Exp $ -->
+<!-- $Id: chkconfig.piml,v 1.23 2012/07/30 01:37:22 raeburn Exp $ -->
<!--
@@ -48,7 +48,7 @@
} 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') {
$webserver = 'apache2';
@runlevels = qw/3 5/;
-} elsif ('<DIST />' eq 'debian5' || '<DIST />' eq 'debian6' || '<DIST />' eq 'ubuntu6' || '<DIST />' eq 'ubuntu8' || '<DIST />' eq 'ubuntu10') {
+} elsif ('<DIST />' eq 'debian5' || '<DIST />' eq 'debian6' || '<DIST />' eq 'ubuntu6' || '<DIST />' eq 'ubuntu8' || '<DIST />' eq 'ubuntu10' || '<DIST />' eq 'ubuntu12') {
@runlevels = qw/2 3 4 5/;
@norunlevels = qw/0 1 6/;
$checker_bin = '/usr/sbin/sysv-rc-conf';
@@ -77,7 +77,7 @@
if ($results eq '') {
print "**** WARNING: $service is not set to run on boot.$/".
" Execute the following commands to fix this:".$/;
- if ('<DIST />' eq 'debian5' || '<DIST />' eq 'debian6' || '<DIST />' eq 'ubuntu6' || '<DIST />' eq 'ubuntu8' || '<DIST />' eq 'ubuntu10') {
+ if ('<DIST />' eq 'debian5' || '<DIST />' eq 'debian6' || '<DIST />' eq 'ubuntu6' || '<DIST />' eq 'ubuntu8' || '<DIST />' eq 'ubuntu10' || '<DIST />' eq 'ubuntu12') {
print " $checker_bin --level $nrlstr $service off".$/;
} else {
print " $checker_bin --add $webserver".$/;
Index: doc/loncapafiles/langcheck.piml
diff -u doc/loncapafiles/langcheck.piml:1.2 doc/loncapafiles/langcheck.piml:1.3
--- doc/loncapafiles/langcheck.piml:1.2 Tue Nov 8 07:33:08 2011
+++ doc/loncapafiles/langcheck.piml Mon Jul 30 01:37:22 2012
@@ -48,7 +48,7 @@
close(PIPE);
}
} elsif ('<DIST />' eq 'debian5' || '<DIST />' eq 'debian6' || '<DIST />' eq 'ubuntu6' ||
- '<DIST />' eq 'ubuntu8' || '<DIST />' eq 'ubuntu10') {
+ '<DIST />' eq 'ubuntu8' || '<DIST />' eq 'ubuntu10' || '<DIST />' eq 'ubuntu12') {
if (open(PIPE,"cat /etc/default/locale |grep '^LANG' |")) {
print "Checking OS language";
if (<PIPE> =~ /^LANG="en/) {
Index: doc/loncapafiles/loncapafiles.lpml
diff -u doc/loncapafiles/loncapafiles.lpml:1.805 doc/loncapafiles/loncapafiles.lpml:1.806
--- doc/loncapafiles/loncapafiles.lpml:1.805 Thu Jul 26 19:59:48 2012
+++ doc/loncapafiles/loncapafiles.lpml Mon Jul 30 01:37:22 2012
@@ -2,7 +2,7 @@
"http://lpml.sourceforge.net/DTD/lpml.dtd">
<!-- loncapafiles.lpml -->
-<!-- $Id: loncapafiles.lpml,v 1.805 2012/07/26 19:59:48 raeburn Exp $ -->
+<!-- $Id: loncapafiles.lpml,v 1.806 2012/07/30 01:37:22 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 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'>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 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'>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 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'>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 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'>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 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'>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 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'>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 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'>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 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'>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 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'>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 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'>etc/rc6.d</targetdir>
<categoryname>standard</categoryname>
<description>scripts that run for run-level 6</description>
</directory>
@@ -1001,7 +1001,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'>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 debian5 debian6 ubuntu6 ubuntu8 ubuntu10 ubuntu12'>etc/apache2/loncapa.conf</target>
<categoryname>conf</categoryname>
<description>
<p>
@@ -1044,7 +1044,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'>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 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
@@ -1064,7 +1064,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'>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 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
@@ -1075,7 +1075,7 @@
</file>
<link>
<linkto>etc/apache2</linkto>
-<target dist='debian5 debian6 ubuntu6 ubuntu8 ubuntu10'>
+<target dist='debian5 debian6 ubuntu6 ubuntu8 ubuntu10 ubuntu12'>
etc/apache2/conf
</target>
<categoryname>symbolic link</categoryname>
@@ -1086,7 +1086,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'>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 debian5 debian6 ubuntu6 ubuntu8 ubuntu10 ubuntu12'>etc/apache2/loncapa_rewrite.conf</target>
<categoryname>conf</categoryname>
<description>
Default rewrite file.
@@ -1098,7 +1098,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'>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 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
@@ -1109,7 +1109,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'>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 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
@@ -6224,7 +6224,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'>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 debian5 debian6 ubuntu6 ubuntu8 ubuntu10 ubuntu12'>etc/apache2/mime.types</target>
<categoryname>www static conf</categoryname>
<description>Expanded mime.types</description>
</file>
@@ -7757,7 +7757,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'>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 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.
@@ -7765,7 +7765,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'>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 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;
@@ -7783,7 +7783,7 @@
etc/rc.d/rc5.d/S95loncontrol;
etc/rc.d/rc6.d/K05loncontrol
</target>
-<target dist='debian5 debian6 ubuntu6 ubuntu8 ubuntu10'>
+<target dist='debian5 debian6 ubuntu6 ubuntu8 ubuntu10 ubuntu12'>
etc/rc0.d/K05loncontrol;
etc/rc1.d/K05loncontrol;
etc/rc2.d/S95loncontrol;
Index: doc/loncapafiles/modify_config_files.piml
diff -u doc/loncapafiles/modify_config_files.piml:1.18 doc/loncapafiles/modify_config_files.piml:1.19
--- doc/loncapafiles/modify_config_files.piml:1.18 Tue Jul 24 04:20:50 2012
+++ doc/loncapafiles/modify_config_files.piml Mon Jul 30 01:37:22 2012
@@ -3,7 +3,7 @@
<!-- modify_config_files.piml -->
<!-- Matthew Hall -->
-<!-- $Id: modify_config_files.piml,v 1.18 2012/07/24 04:20:50 raeburn Exp $ -->
+<!-- $Id: modify_config_files.piml,v 1.19 2012/07/30 01:37:22 raeburn Exp $ -->
<!--
@@ -42,7 +42,7 @@
$configfiles = 'MySQL';
} elsif ('<DIST />' eq 'rhes4') {
$configfiles = 'MySQL';
-} elsif ('<DIST />' eq 'debian5' || '<DIST />' eq 'debian6' || '<DIST />' eq 'ubuntu6' || '<DIST />' eq 'ubuntu8' || '<DIST />' eq 'ubuntu10') {
+} elsif ('<DIST />' eq 'debian5' || '<DIST />' eq 'debian6' || '<DIST />' eq 'ubuntu6' || '<DIST />' eq 'ubuntu8' || '<DIST />' eq 'ubuntu10' || '<DIST />' eq 'ubuntu12') {
$configfiles = 'Apt and MySQL';
$mysqlcmd = '/etc/init.d/mysql restart';
} elsif (('<DIST />' eq 'fedora16') || ('<DIST />' eq 'fedora17')) {
Index: doc/loncapafiles/ntpcheck.piml
diff -u doc/loncapafiles/ntpcheck.piml:1.16 doc/loncapafiles/ntpcheck.piml:1.17
--- doc/loncapafiles/ntpcheck.piml:1.16 Tue Jul 24 04:20:50 2012
+++ doc/loncapafiles/ntpcheck.piml Mon Jul 30 01:37:22 2012
@@ -3,7 +3,7 @@
<!-- ntpcheck.piml -->
<!-- Matthew Hall -->
-<!-- $Id: ntpcheck.piml,v 1.16 2012/07/24 04:20:50 raeburn Exp $ -->
+<!-- $Id: ntpcheck.piml,v 1.17 2012/07/30 01:37:22 raeburn Exp $ -->
<!--
@@ -76,7 +76,7 @@
# chkconfig barfs to stderr if the target isn't set up right.
my $checking_bin;
my $restartchk;
-if ('<DIST />' eq 'debian5' || '<DIST />' eq 'debian6' || '<DIST />' eq 'ubuntu6' || '<DIST />' eq 'ubuntu8' || '<DIST />' eq 'ubuntu10') {
+if ('<DIST />' eq 'debian5' || '<DIST />' eq 'debian6' || '<DIST />' eq 'ubuntu6' || '<DIST />' eq 'ubuntu8' || '<DIST />' eq 'ubuntu10' || '<DIST />' eq 'ubuntu12') {
$checking_bin = '/usr/sbin/sysv-rc-conf';
} else {
$checking_bin = '/sbin/chkconfig';
Index: doc/loncapafiles/picins_check.piml
diff -u doc/loncapafiles/picins_check.piml:1.16 doc/loncapafiles/picins_check.piml:1.17
--- doc/loncapafiles/picins_check.piml:1.16 Tue Jul 24 04:20:50 2012
+++ doc/loncapafiles/picins_check.piml Mon Jul 30 01:37:22 2012
@@ -3,7 +3,7 @@
<!-- picins_check.piml -->
<!-- Stuart Raeburn -->
-<!-- $Id: picins_check.piml,v 1.16 2012/07/24 04:20:50 raeburn Exp $ -->
+<!-- $Id: picins_check.piml,v 1.17 2012/07/30 01:37:22 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">
+<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">
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.36 doc/loncapafiles/sanitycheck.piml:1.37
--- doc/loncapafiles/sanitycheck.piml:1.36 Sun Nov 6 00:41:53 2011
+++ doc/loncapafiles/sanitycheck.piml Mon Jul 30 01:37:22 2012
@@ -2,7 +2,7 @@
"http://lpml.sourceforge.net/DTD/piml.dtd">
<!-- sanitycheck.piml -->
-<!-- $Id: sanitycheck.piml,v 1.36 2011/11/06 00:41:53 raeburn Exp $ -->
+<!-- $Id: sanitycheck.piml,v 1.37 2012/07/30 01:37:22 raeburn Exp $ -->
<!--
@@ -61,7 +61,7 @@
<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='debian5 debian6 ubuntu6 ubuntu8 ubuntu10'>/var/run/mysqld/mysqld.sock</target>
+<target dist='debian5 debian6 ubuntu6 ubuntu8 ubuntu10 ubuntu12'>/var/run/mysqld/mysqld.sock</target>
<perlscript mode='fg'>
unless
(-e '<TARGET />') # Does file exist?
@@ -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'>/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 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.73 doc/loncapafiles/updatequery.piml:1.74
--- doc/loncapafiles/updatequery.piml:1.73 Sun Nov 6 15:07:14 2011
+++ doc/loncapafiles/updatequery.piml Mon Jul 30 01:37:22 2012
@@ -1,6 +1,6 @@
<!-- updatequery.piml -->
-<!-- $Id: updatequery.piml,v 1.73 2011/11/06 15:07:14 raeburn Exp $ -->
+<!-- $Id: updatequery.piml,v 1.74 2012/07/30 01:37:22 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') {
+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') {
$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'>/etc/apache2/</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>
<perlscript mode='fg'>
sub securesetting {
my (%perlvar)=@_;
Index: doc/loncapafiles/verify_domconfiguser.piml
diff -u doc/loncapafiles/verify_domconfiguser.piml:1.10 doc/loncapafiles/verify_domconfiguser.piml:1.11
--- doc/loncapafiles/verify_domconfiguser.piml:1.10 Sun Nov 6 18:56:32 2011
+++ doc/loncapafiles/verify_domconfiguser.piml Mon Jul 30 01:37:22 2012
@@ -3,7 +3,7 @@
<!-- verify_domconfiguser.piml -->
<!-- Stuart Raeburn -->
-<!-- $Id: verify_domconfiguser.piml,v 1.10 2011/11/06 18:56:32 raeburn Exp $ -->
+<!-- $Id: verify_domconfiguser.piml,v 1.11 2012/07/30 01:37:22 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 'debian5' || '<DIST />' eq 'debian6' || '<DIST />' eq 'ubuntu6' || '<DIST />' eq 'ubuntu8' || '<DIST />' eq 'ubuntu10') {
+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') {
$confdir = '/etc/apache2/';
}
foreach my $filename (@conffiles) {
Index: doc/loncapafiles/webserver.piml
diff -u doc/loncapafiles/webserver.piml:1.33 doc/loncapafiles/webserver.piml:1.34
--- doc/loncapafiles/webserver.piml:1.33 Sun Nov 6 00:41:53 2011
+++ doc/loncapafiles/webserver.piml Mon Jul 30 01:37:22 2012
@@ -2,7 +2,7 @@
"http://lpml.sourceforge.net/DTD/piml.dtd">
<!-- webserver.piml -->
-<!-- $Id: webserver.piml,v 1.33 2011/11/06 00:41:53 raeburn Exp $ -->
+<!-- $Id: webserver.piml,v 1.34 2012/07/30 01:37:22 raeburn Exp $ -->
<!--
@@ -47,7 +47,7 @@
<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='debian5 debian6 ubuntu6 ubuntu8 ubuntu10'>/etc/apache2/sites-available/loncapa</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'>
/etc/httpd/conf/httpd.conf
@@ -55,7 +55,7 @@
<dependencies dist='suse9.2 suse9.3 sles9'>
/etc/httpd/httpd.conf
</dependencies>
-<dependencies dist='debian5 debian6 ubuntu6 ubuntu8 ubuntu10'>
+<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'>
Index: doc/loncapafiles/wrap_setuid.piml
diff -u doc/loncapafiles/wrap_setuid.piml:1.17 doc/loncapafiles/wrap_setuid.piml:1.18
--- doc/loncapafiles/wrap_setuid.piml:1.17 Tue Jul 24 04:20:50 2012
+++ doc/loncapafiles/wrap_setuid.piml Mon Jul 30 01:37:22 2012
@@ -3,7 +3,7 @@
<!-- wrap_setuid.piml -->
<!-- Guy Albertelli -->
-<!-- $Id: wrap_setuid.piml,v 1.17 2012/07/24 04:20:50 raeburn Exp $ -->
+<!-- $Id: wrap_setuid.piml,v 1.18 2012/07/30 01:37: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">
+<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">
$fslist='<TARGET />';
open(FIND, "find <TARGET /> -xdev -type f \\( -perm -04000 -o -perm -02000 \\) -print|");
More information about the LON-CAPA-cvs
mailing list