[LON-CAPA-cvs] cvs: doc /loncapafiles chkconfig.piml modify_config_files.piml picins_check.piml sanitycheck.piml updatequery.piml verify_domconfiguser.piml webserver.piml
raeburn
raeburn@source.lon-capa.org
Sun, 27 Feb 2011 18:55:00 -0000
This is a MIME encoded message
--raeburn1298832900
Content-Type: text/plain
raeburn Sun Feb 27 18:55:00 2011 EDT
Modified files:
/doc/loncapafiles chkconfig.piml modify_config_files.piml
picins_check.piml sanitycheck.piml
updatequery.piml verify_domconfiguser.piml
webserver.piml
Log:
- Support Debian 6, Ubuntu 10 LTS, SuSE 11.4.
--raeburn1298832900
Content-Type: text/plain
Content-Disposition: attachment; filename="raeburn-20110227185500.txt"
Index: doc/loncapafiles/chkconfig.piml
diff -u doc/loncapafiles/chkconfig.piml:1.12 doc/loncapafiles/chkconfig.piml:1.13
--- doc/loncapafiles/chkconfig.piml:1.12 Sat Jan 1 21:49:56 2011
+++ doc/loncapafiles/chkconfig.piml Sun Feb 27 18:54:59 2011
@@ -3,7 +3,7 @@
<!-- checkconfig.piml -->
<!-- Matthew Hall -->
-<!-- $Id: chkconfig.piml,v 1.12 2011/01/01 21:49:56 raeburn Exp $ -->
+<!-- $Id: chkconfig.piml,v 1.13 2011/02/27 18:54:59 raeburn Exp $ -->
<!--
@@ -44,9 +44,9 @@
$checker_bin = '/';
$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') {
+} 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') {
$webserver = 'apache2';
-} elsif ('<DIST />' eq 'debian5' || '<DIST />' eq 'ubuntu6' || '<DIST />' eq 'ubuntu8') {
+} elsif ('<DIST />' eq 'debian5' || '<DIST />' eq 'debian6' || '<DIST />' eq 'ubuntu6' || '<DIST />' eq 'ubuntu8' || '<DIST />' eq 'ubuntu10') {
$checker_bin = '/usr/sbin/sysv-rc-conf';
$webserver = 'apache2';
}
Index: doc/loncapafiles/modify_config_files.piml
diff -u doc/loncapafiles/modify_config_files.piml:1.13 doc/loncapafiles/modify_config_files.piml:1.14
--- doc/loncapafiles/modify_config_files.piml:1.13 Sun Jan 2 03:08:54 2011
+++ doc/loncapafiles/modify_config_files.piml Sun Feb 27 18:54:59 2011
@@ -3,7 +3,7 @@
<!-- modify_config_files.piml -->
<!-- Matthew Hall -->
-<!-- $Id: modify_config_files.piml,v 1.13 2011/01/02 03:08:54 raeburn Exp $ -->
+<!-- $Id: modify_config_files.piml,v 1.14 2011/02/27 18:54:59 raeburn Exp $ -->
<!--
@@ -37,12 +37,12 @@
<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 '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') {
+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') {
$mysqldaemon = 'mysql';
$configfiles = 'MySQL';
} elsif ('<DIST />' eq 'rhes4') {
$configfiles = 'MySQL';
-} elsif ('<DIST />' eq 'debian5' || '<DIST />' eq 'ubuntu6' || '<DIST />' eq 'ubuntu8') {
+} elsif ('<DIST />' eq 'debian5' || '<DIST />' eq 'debian6' || '<DIST />' eq 'ubuntu6' || '<DIST />' eq 'ubuntu8' || '<DIST />' eq 'ubuntu10') {
$configfiles = 'Apt and MySQL';
$mysqldaemon = 'mysql';
}
Index: doc/loncapafiles/picins_check.piml
diff -u doc/loncapafiles/picins_check.piml:1.10 doc/loncapafiles/picins_check.piml:1.11
--- doc/loncapafiles/picins_check.piml:1.10 Sat Jan 1 21:49:56 2011
+++ doc/loncapafiles/picins_check.piml Sun Feb 27 18:54:59 2011
@@ -3,7 +3,7 @@
<!-- picins_check.piml -->
<!-- Stuart Raeburn -->
-<!-- $Id: picins_check.piml,v 1.10 2011/01/01 21:49:56 raeburn Exp $ -->
+<!-- $Id: picins_check.piml,v 1.11 2011/02/27 18:54:59 raeburn Exp $ -->
<!--
@@ -32,7 +32,7 @@
<piml>
<files>
<file>
-<perlscript mode="fg" dist="fedora9 fedora10 fedora11 fedora12 fedora13 fedora14 rhes6 sles11 suse11.1 suse11.2 suse11.3 debian5 ubuntu8">
+<perlscript mode="fg" dist="fedora9 fedora10 fedora11 fedora12 fedora13 fedora14 rhes6 sles11 suse11.1 suse11.2 suse11.3 suse11.4 debian5 debian6 ubuntu8 ubuntu10">
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.34 doc/loncapafiles/sanitycheck.piml:1.35
--- doc/loncapafiles/sanitycheck.piml:1.34 Sat Jan 1 21:49:56 2011
+++ doc/loncapafiles/sanitycheck.piml Sun Feb 27 18:54:59 2011
@@ -2,7 +2,7 @@
"http://lpml.sourceforge.net/DTD/piml.dtd">
<!-- sanitycheck.piml -->
-<!-- $Id: sanitycheck.piml,v 1.34 2011/01/01 21:49:56 raeburn Exp $ -->
+<!-- $Id: sanitycheck.piml,v 1.35 2011/02/27 18:54:59 raeburn Exp $ -->
<!--
@@ -60,8 +60,8 @@
</file>
<file>
<target dist='default'>/var/lib/mysql/mysql.sock</target>
-<target dist='suse11.2 suse11.3'>/var/run/mysql/mysql.sock</target>
-<target dist='debian5 ubuntu6 ubuntu8'>/var/run/mysqld/mysqld.sock</target>
+<target dist='suse11.2 suse11.3 suse11.4'>/var/run/mysql/mysql.sock</target>
+<target dist='debian5 debian6 ubuntu6 ubuntu8 ubuntu10'>/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 debian5 ubuntu6 ubuntu8'>/etc/apache2/loncapa.conf</target>
+<target dist='sles10 sles11 suse10.1 suse10.2 suse10.3 suse11.1 suse11.2 suse11.3 suse11.4 debian5 debian6 ubuntu6 ubuntu8 ubuntu10'>/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.68 doc/loncapafiles/updatequery.piml:1.69
--- doc/loncapafiles/updatequery.piml:1.68 Thu Jan 13 17:49:23 2011
+++ doc/loncapafiles/updatequery.piml Sun Feb 27 18:54:59 2011
@@ -1,6 +1,6 @@
<!-- updatequery.piml -->
-<!-- $Id: updatequery.piml,v 1.68 2011/01/13 17:49:23 raeburn Exp $ -->
+<!-- $Id: updatequery.piml,v 1.69 2011/02/27 18:54:59 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 'debian5' || '<DIST />' eq 'ubuntu6' || '<DIST />' eq 'ubuntu8') {
+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 'debian5' || '<DIST />' eq 'debian6' || '<DIST />' eq 'ubuntu6' || '<DIST />' eq 'ubuntu8' || '<DIST />' eq 'ubuntu10') {
$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 debian5 ubuntu6 ubuntu8'>/etc/apache2/</target>
+<target dist='sles10 sles11 suse10.1 suse10.2 suse10.3 suse11.1 suse11.2 suse11.3 suse11.4 debian5 debian6 ubuntu6 ubuntu8 ubuntu10'>/etc/apache2/</target>
<perlscript mode='fg'>
sub securesetting {
my (%perlvar)=@_;
Index: doc/loncapafiles/verify_domconfiguser.piml
diff -u doc/loncapafiles/verify_domconfiguser.piml:1.7 doc/loncapafiles/verify_domconfiguser.piml:1.8
--- doc/loncapafiles/verify_domconfiguser.piml:1.7 Sun Jan 2 03:08:25 2011
+++ doc/loncapafiles/verify_domconfiguser.piml Sun Feb 27 18:54:59 2011
@@ -3,7 +3,7 @@
<!-- verify_domconfiguser.piml -->
<!-- Stuart Raeburn -->
-<!-- $Id: verify_domconfiguser.piml,v 1.7 2011/01/02 03:08:25 raeburn Exp $ -->
+<!-- $Id: verify_domconfiguser.piml,v 1.8 2011/02/27 18:54:59 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 'debian5' || '<DIST />' eq 'ubuntu6' || '<DIST />' eq 'ubuntu8') {
+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 'debian5' || '<DIST />' eq 'debian6' || '<DIST />' eq 'ubuntu6' || '<DIST />' eq 'ubuntu8' || '<DIST />' eq 'ubuntu10') {
$confdir = '/etc/apache2/';
}
foreach my $filename (@conffiles) {
Index: doc/loncapafiles/webserver.piml
diff -u doc/loncapafiles/webserver.piml:1.30 doc/loncapafiles/webserver.piml:1.31
--- doc/loncapafiles/webserver.piml:1.30 Sun Jan 2 03:12:01 2011
+++ doc/loncapafiles/webserver.piml Sun Feb 27 18:54:59 2011
@@ -2,7 +2,7 @@
"http://lpml.sourceforge.net/DTD/piml.dtd">
<!-- webserver.piml -->
-<!-- $Id: webserver.piml,v 1.30 2011/01/02 03:12:01 raeburn Exp $ -->
+<!-- $Id: webserver.piml,v 1.31 2011/02/27 18:54:59 raeburn Exp $ -->
<!--
@@ -46,8 +46,8 @@
<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'>/etc/apache2/default-server.conf</target>
-<target dist='debian5 ubuntu6 ubuntu8'>/etc/apache2/sites-available/loncapa</target>
+<target dist='sles10 sles11 suse10.1 suse10.2 suse10.3 suse11.1 suse11.2 suse11.3 suse11.4'>/etc/apache2/default-server.conf</target>
+<target dist='debian5 debian6 ubuntu6 ubuntu8 ubuntu10'>/etc/apache2/sites-available/loncapa</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, 11.X and SLES 10 distributions, and Debian 5, Ubuntu 6 and Ubuntu 8 LTS distributions</note>
<dependencies dist='default'>
/etc/httpd/conf/httpd.conf
@@ -55,10 +55,10 @@
<dependencies dist='suse9.2 suse9.3 sles9'>
/etc/httpd/httpd.conf
</dependencies>
-<dependencies dist='debian5 ubuntu6 ubuntu8'>
+<dependencies dist='debian5 debian6 ubuntu6 ubuntu8 ubuntu10'>
/etc/apache2/sites-available/loncapa
</dependencies>
-<dependencies dist='sles10 sles11 suse10.1 suse10.2 suse10.3 suse11.1 suse11.2 suse11.3'>
+<dependencies dist='sles10 sles11 suse10.1 suse10.2 suse10.3 suse11.1 suse11.2 suse11.3 suse11.4'>
/etc/apache2/default-server.conf
</dependencies>
<perlscript mode='fg' dist="default">
--raeburn1298832900--