[prev in list] [next in list] [prev in thread] [next in thread]
List: lon-capa-cvs
Subject: [LON-CAPA-cvs] cvs: doc /loncapafiles sanitycheck.piml updatequery.piml verify_domconfiguser.piml
From: raeburn <raeburn () source ! lon-capa ! org>
Date: 2018-10-28 3:07:37
Message-ID: cvsraeburn1540696057 () cvsserver
[Download RAW message or body]
This is a MIME encoded message
raeburn Sun Oct 28 03:07:37 2018 EDT
Modified files:
/doc/loncapafiles sanitycheck.piml updatequery.piml
verify_domconfiguser.piml
Log:
- Support SLES 15.
["raeburn-20181028030737.txt" (text/plain)]
Index: doc/loncapafiles/sanitycheck.piml
diff -u doc/loncapafiles/sanitycheck.piml:1.45 doc/loncapafiles/sanitycheck.piml:1.46
--- doc/loncapafiles/sanitycheck.piml:1.45 Tue Jun 19 12:26:32 2018
+++ doc/loncapafiles/sanitycheck.piml Sun Oct 28 03:07:37 2018
@@ -2,7 +2,7 @@
"http://lpml.sourceforge.net/DTD/piml.dtd">
<!-- sanitycheck.piml -->
-<!-- $Id: sanitycheck.piml,v 1.45 2018/06/19 12:26:32 raeburn Exp $ -->
+<!-- $Id: sanitycheck.piml,v 1.46 2018/10/28 03:07:37 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 suse12.3 suse13.1 \
suse13.2 sles12'>/var/run/mysql/mysql.sock</target> +<target dist='suse11.2 suse11.3 \
suse11.4 suse12.1 suse12.2 suse12.3 suse13.1 suse13.2 sles12 \
sles15'>/var/run/mysql/mysql.sock</target> <target dist='debian5 debian6 ubuntu6 \
ubuntu8 ubuntu10 ubuntu12 ubuntu14 ubuntu16 \
ubuntu18'>/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 sles12 suse10.1 suse10.2 suse10.3 suse11.1 suse11.2 \
suse11.3 suse11.4 suse12.1 suse12.2 suse12.3 suse13.1 suse13.2 debian5 debian6 \
ubuntu6 ubuntu8 ubuntu10 ubuntu12 ubuntu14 ubuntu16 \
ubuntu18'>/etc/apache2/loncapa.conf</target> +<target dist='sles10 sles11 sles12 \
sles15 suse10.1 suse10.2 suse10.3 suse11.1 suse11.2 suse11.3 suse11.4 suse12.1 \
suse12.2 suse12.3 suse13.1 suse13.2 debian5 debian6 ubuntu6 ubuntu8 ubuntu10 ubuntu12 \
ubuntu14 ubuntu16 ubuntu18'>/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.90 doc/loncapafiles/updatequery.piml:1.91
--- doc/loncapafiles/updatequery.piml:1.90 Sat Aug 18 22:08:05 2018
+++ doc/loncapafiles/updatequery.piml Sun Oct 28 03:07:37 2018
@@ -1,6 +1,6 @@
<!-- updatequery.piml -->
-<!-- $Id: updatequery.piml,v 1.90 2018/08/18 22:08:05 raeburn Exp $ -->
+<!-- $Id: updatequery.piml,v 1.91 2018/10/28 03:07:37 raeburn Exp $ -->
<!--
@@ -62,7 +62,7 @@
sub get_static_config {
# get LCperlvars from loncapa_apache.conf
my $confdir = '/etc/httpd/conf/';
- if ('<DIST />' eq 'sles10' || '<DIST />' eq 'sles11' || '<DIST />' eq 'sles12' \
|| '<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 'suse13.1' || '<DIST />' eq 'suse13.2' \
|| '<DIST />' eq 'debian5' || '<DIST />' eq 'debian6' || '<DIST />' eq 'ubuntu6' || \
'<DIST />' eq 'ubuntu8' || '<DIST />' eq 'ubuntu10' || '<DIST />' eq 'ubuntu12' || \
'<DIST />' eq 'ubuntu14' || '<DIST />' eq 'ubuntu16' || '<DIST />' eq 'ubuntu18') { + \
if ('<DIST />' eq 'sles10' || '<DIST />' eq 'sles11' || '<DIST />' eq 'sles12' || \
'<DIST />' eq 'sles15' || '<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 'suse13.1' || \
'<DIST />' eq 'suse13.2' || '<DIST />' eq 'debian5' || '<DIST />' eq 'debian6' || \
'<DIST />' eq 'ubuntu6' || '<DIST />' eq 'ubuntu8' || '<DIST />' eq 'ubuntu10' || \
'<DIST />' eq 'ubuntu12' || '<DIST />' eq 'ubuntu14' || '<DIST />' eq 'ubuntu16' || \
'<DIST />' eq 'ubuntu18') { $confdir = '/etc/apache2/';
}
my $filename='loncapa_apache.conf';
@@ -1301,7 +1301,7 @@
# update loncapa.conf
my $confdir = '/etc/httpd/conf/';
-if ('<DIST />' eq 'sles10' || '<DIST />' eq 'sles11' || '<DIST />' eq 'sles12' || \
'<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 'suse13.1' || '<DIST />' eq 'suse13.2' || \
'<DIST />' eq 'debian5' || '<DIST />' eq 'debian6' || '<DIST />' eq 'ubuntu6' || \
'<DIST />' eq 'ubuntu8' || '<DIST />' eq 'ubuntu10' || '<DIST />' eq 'ubuntu12' || \
'<DIST />' eq 'ubuntu14' || '<DIST />' eq 'ubuntu16' || '<DIST />' eq 'ubuntu18') { \
+if ('<DIST />' eq 'sles10' || '<DIST />' eq 'sles11' || '<DIST />' eq 'sles12' || \
'<DIST />' eq 'sles15' || '<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 'suse13.1' || \
'<DIST />' eq 'suse13.2' || '<DIST />' eq 'debian5' || '<DIST />' eq 'debian6' || \
'<DIST />' eq 'ubuntu6' || '<DIST />' eq 'ubuntu8' || '<DIST />' eq 'ubuntu10' || \
'<DIST />' eq 'ubuntu12' || '<DIST />' eq 'ubuntu14' || '<DIST />' eq 'ubuntu16' || \
'<DIST />' eq 'ubuntu18') { $confdir = '/etc/apache2/';
}
my $filename='loncapa.conf';
@@ -1358,7 +1358,7 @@
</file>
<file>
<target dist='default'>/etc/httpd/conf/</target>
-<target dist='sles10 sles11 sles12 suse10.1 suse10.2 suse10.3 suse11.1 suse11.2 \
suse11.3 suse11.4 suse12.1 suse12.2 suse12.3 suse13.1 suse13.2 debian5 debian6 \
ubuntu6 ubuntu8 ubuntu10 ubuntu12 ubuntu14 ubuntu16 ubuntu18'>/etc/apache2/</target> \
+<target dist='sles10 sles11 sles12 sles15 suse10.1 suse10.2 suse10.3 suse11.1 \
suse11.2 suse11.3 suse11.4 suse12.1 suse12.2 suse12.3 suse13.1 suse13.2 debian5 \
debian6 ubuntu6 ubuntu8 ubuntu10 ubuntu12 ubuntu14 ubuntu16 \
ubuntu18'>/etc/apache2/</target> <perlscript mode='fg'>
# read values from loncapa.conf
my $confdir = "<TARGET />";
Index: doc/loncapafiles/verify_domconfiguser.piml
diff -u doc/loncapafiles/verify_domconfiguser.piml:1.26 \
doc/loncapafiles/verify_domconfiguser.piml:1.27
--- doc/loncapafiles/verify_domconfiguser.piml:1.26 Tue Jun 19 12:26:32 2018
+++ doc/loncapafiles/verify_domconfiguser.piml Sun Oct 28 03:07:37 2018
@@ -3,7 +3,7 @@
<!-- verify_domconfiguser.piml -->
<!-- Stuart Raeburn -->
-<!-- $Id: verify_domconfiguser.piml,v 1.26 2018/06/19 12:26:32 raeburn Exp $ -->
+<!-- $Id: verify_domconfiguser.piml,v 1.27 2018/10/28 03:07:37 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 'sles12' || \
'<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 'suse13.1' || '<DIST />' eq 'suse13.2' || \
'<DIST />' eq 'debian5' || '<DIST />' eq 'debian6' || '<DIST />' eq 'ubuntu6' || \
'<DIST />' eq 'ubuntu8' || '<DIST />' eq 'ubuntu10' || '<DIST />' eq 'ubuntu12' || \
'<DIST />' eq 'ubuntu14' || '<DIST />' eq 'ubuntu16' || '<DIST />' eq 'ubuntu18') { \
+if ('<DIST />' eq 'sles10' || '<DIST />' eq 'sles11' || '<DIST />' eq 'sles12' || \
'<DIST />' eq 'sles15' || '<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 'suse13.1' || \
'<DIST />' eq 'suse13.2' || '<DIST />' eq 'debian5' || '<DIST />' eq 'debian6' || \
'<DIST />' eq 'ubuntu6' || '<DIST />' eq 'ubuntu8' || '<DIST />' eq 'ubuntu10' || \
'<DIST />' eq 'ubuntu12' || '<DIST />' eq 'ubuntu14' || '<DIST />' eq 'ubuntu16' || \
'<DIST />' eq 'ubuntu18') { $confdir = '/etc/apache2/';
}
foreach my $filename (@conffiles) {
_______________________________________________
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