[LON-CAPA-cvs] cvs: doc /install/linux install.pl /loncapafiles chkconfig.piml langcheck.piml loncapafiles.lpml modify_config_files.piml ntpcheck.piml picins_check.piml rpmcheck.piml webserver.piml wrap_setuid.piml loncom lond loncom/build Makefile distprobe loncom/configuration Firewall.pm loncom/debugging_tools modify_config_files.pl
raeburn
raeburn at source.lon-capa.org
Tue Jul 2 15:40:36 EDT 2019
raeburn Tue Jul 2 19:40:36 2019 EDT
Modified files:
/doc/loncapafiles chkconfig.piml langcheck.piml loncapafiles.lpml
modify_config_files.piml ntpcheck.piml
picins_check.piml rpmcheck.piml webserver.piml
wrap_setuid.piml
/loncom lond
/loncom/configuration Firewall.pm
/loncom/debugging_tools modify_config_files.pl
/loncom/build distprobe Makefile
/doc/install/linux install.pl
Log:
- Support Oracle Linux 7
-------------- next part --------------
Index: doc/loncapafiles/chkconfig.piml
diff -u doc/loncapafiles/chkconfig.piml:1.44 doc/loncapafiles/chkconfig.piml:1.45
--- doc/loncapafiles/chkconfig.piml:1.44 Mon May 27 01:26:26 2019
+++ doc/loncapafiles/chkconfig.piml Tue Jul 2 19:40:13 2019
@@ -3,7 +3,7 @@
<!-- checkconfig.piml -->
<!-- Matthew Hall -->
-<!-- $Id: chkconfig.piml,v 1.44 2019/05/27 01:26:26 raeburn Exp $ -->
+<!-- $Id: chkconfig.piml,v 1.45 2019/07/02 19:40:13 raeburn Exp $ -->
<!--
@@ -61,7 +61,7 @@
} elsif (('<DIST />' eq 'fedora26') || ('<DIST />' eq 'fedora27') ||
('<DIST />' eq 'fedora28') || ('<DIST />' eq 'fedora29') ||
('<DIST />' eq 'fedora30') || ('<DIST />' eq 'centos8') ||
- ('<DIST />' eq 'rhes8')) {
+ ('<DIST />' eq 'rhes8') || ('<DIST />' eq 'oracle7')) {
$use_systemctl = 1;
$systemctl_only = 1;
}
Index: doc/loncapafiles/langcheck.piml
diff -u doc/loncapafiles/langcheck.piml:1.18 doc/loncapafiles/langcheck.piml:1.19
--- doc/loncapafiles/langcheck.piml:1.18 Mon May 27 01:26:26 2019
+++ doc/loncapafiles/langcheck.piml Tue Jul 2 19:40:13 2019
@@ -66,7 +66,8 @@
'<DIST />' eq 'fedora24' || '<DIST />' eq 'fedora25' || '<DIST />' eq 'fedora26' ||
'<DIST />' eq 'fedora27' || '<DIST />' eq 'fedora28' || '<DIST />' eq 'fedora29' ||
'<DIST />' eq 'fedora30' || '<DIST />' eq 'rhes7' || '<DIST />' eq 'centos7' ||
- '<DIST />' eq 'scientific7' || '<DIST />' eq 'rhes8' || '<DIST />' eq 'centos8') {
+ '<DIST />' eq 'scientific7' || '<DIST />' eq 'rhes8' || '<DIST />' eq 'centos8' ||
+ '<DIST />' eq 'oracle7') {
if (open(PIPE,"cat /etc/locale.conf |grep '^LANG' |")) {
print "Checking OS language";
if (<PIPE> =~ /^LANG="en/) {
Index: doc/loncapafiles/loncapafiles.lpml
diff -u doc/loncapafiles/loncapafiles.lpml:1.988 doc/loncapafiles/loncapafiles.lpml:1.989
--- doc/loncapafiles/loncapafiles.lpml:1.988 Mon May 27 01:26:26 2019
+++ doc/loncapafiles/loncapafiles.lpml Tue Jul 2 19:40:13 2019
@@ -2,7 +2,7 @@
"http://lpml.sourceforge.net/DTD/lpml.dtd">
<!-- loncapafiles.lpml -->
-<!-- $Id: loncapafiles.lpml,v 1.988 2019/05/27 01:26:26 raeburn Exp $ -->
+<!-- $Id: loncapafiles.lpml,v 1.989 2019/07/02 19:40:13 raeburn Exp $ -->
<!--
@@ -8699,7 +8699,7 @@
<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 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'>etc/init.d/loncontrol</target>
-<target dist='fedora26 fedora27 fedora28 fedora29 fedora30 sles15 ubuntu18 rhes8 centos8'>home/httpd/perl/loncontrol</target>
+<target dist='fedora26 fedora27 fedora28 fedora29 fedora30 sles15 ubuntu18 rhes8 centos8 oracle7'>home/httpd/perl/loncontrol</target>
<categoryname>root script</categoryname>
<description>
Controls the launching/halting of lonc, lond, and lonsql processes.
@@ -8708,7 +8708,7 @@
<file>
<source>loncom/init.d/loncontrol.service</source>
<target dist='default'>home/httpd/perl/systemd/loncontrol.service</target>
-<target dist='fedora26 fedora27 fedora28 fedora29 fedora30 sles15 ubuntu18 rhes8 centos8'>etc/systemd/system/loncontrol.service</target>
+<target dist='fedora26 fedora27 fedora28 fedora29 fedora30 sles15 ubuntu18 rhes8 centos8 oracle7'>etc/systemd/system/loncontrol.service</target>
<categoryname>static conf</categoryname>
<description>
Controls the launching/halting of lon-capa daemons by loncontrol in systemd
@@ -8717,7 +8717,7 @@
<link>
<linkto dist='default'>etc/rc.d/init.d/loncontrol</linkto>
<linkto dist='suse9.2 suse9.3 sles9 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'>etc/init.d/loncontrol</linkto>
-<linkto dist='fedora26 fedora27 fedora28 fedora29 fedora30 sles15 ubuntu18 rhes8 centos8'>home/httpd/perl/loncontrol</linkto>
+<linkto dist='fedora26 fedora27 fedora28 fedora29 fedora30 sles15 ubuntu18 rhes8 centos8 oracle7'>home/httpd/perl/loncontrol</linkto>
<target dist='default'>
etc/rc.d/rc0.d/K05loncontrol;
etc/rc.d/rc1.d/K05loncontrol;
@@ -8744,7 +8744,7 @@
etc/rc5.d/S95loncontrol;
etc/rc6.d/K05loncontrol
</target>
-<target dist='fedora26 fedora27 fedora28 fedora29 fedora30 sles15 ubuntu18 rhes8 centos8'>
+<target dist='fedora26 fedora27 fedora28 fedora29 fedora30 sles15 ubuntu18 rhes8 centos8 oracle7'>
etc/rc.d/init.d/loncontrol
</target>
<categoryname>symbolic link</categoryname>
@@ -8766,13 +8766,13 @@
loncom/init.d/loncontrol
</dependencies>
</file>
-<file dist="fedora26 fedora27 fedora28 fedora29 fedora30 sles15 ubuntu18 rhes8 centos8">
+<file dist="fedora26 fedora27 fedora28 fedora29 fedora30 sles15 ubuntu18 rhes8 centos8 oracle7">
<source>loncom/init.d/loncontrol.service</source>
<target>etc/systemd/system/loncontrol.service</target>
<description>
Controls the launching/halting of lon-capa daemons by loncontrol in systemd
</description>
- <installscript dist="fedora26 fedora27 fedora28 fedora29 fedora30 sles15 rhes8 centos8">
+ <installscript dist="fedora26 fedora27 fedora28 fedora29 fedora30 sles15 rhes8 centos8 oracle7">
-c '/usr/bin/systemctl enable loncontrol.service'
</installscript>
<installscript dist="ubuntu18">
Index: doc/loncapafiles/modify_config_files.piml
diff -u doc/loncapafiles/modify_config_files.piml:1.39 doc/loncapafiles/modify_config_files.piml:1.40
--- doc/loncapafiles/modify_config_files.piml:1.39 Mon May 27 01:26:26 2019
+++ doc/loncapafiles/modify_config_files.piml Tue Jul 2 19:40:13 2019
@@ -3,7 +3,7 @@
<!-- modify_config_files.piml -->
<!-- Matthew Hall -->
-<!-- $Id: modify_config_files.piml,v 1.39 2019/05/27 01:26:26 raeburn Exp $ -->
+<!-- $Id: modify_config_files.piml,v 1.40 2019/07/02 19:40:13 raeburn Exp $ -->
<!--
@@ -58,7 +58,8 @@
('<DIST />' eq 'fedora25') || ('<DIST />' eq 'fedora26') ||
('<DIST />' eq 'fedora27') || ('<DIST />' eq 'fedora28') ||
('<DIST />' eq 'fedora29') || ('<DIST />' eq 'fedora30') ||
- ('<DIST />' eq 'centos8') || ('<DIST />' eq 'rhes8')) {
+ ('<DIST />' eq 'centos8') || ('<DIST />' eq 'rhes8') ||
+ ('<DIST />' eq 'oracle7')) {
$mysqlcmd = '/bin/systemctl restart mariadb.service';
} elsif ('<DIST />' eq 'ubuntu18') {
$configfiles = 'Apt and MySQL';
Index: doc/loncapafiles/ntpcheck.piml
diff -u doc/loncapafiles/ntpcheck.piml:1.36 doc/loncapafiles/ntpcheck.piml:1.37
--- doc/loncapafiles/ntpcheck.piml:1.36 Mon May 27 01:56:28 2019
+++ doc/loncapafiles/ntpcheck.piml Tue Jul 2 19:40:13 2019
@@ -3,7 +3,7 @@
<!-- ntpcheck.piml -->
<!-- Matthew Hall -->
-<!-- $Id: ntpcheck.piml,v 1.36 2019/05/27 01:56:28 raeburn Exp $ -->
+<!-- $Id: ntpcheck.piml,v 1.37 2019/07/02 19:40:13 raeburn Exp $ -->
<!--
@@ -36,7 +36,7 @@
<target dist="default"></target>
<perlscript mode="fg">
print "Checking to be sure the Network Time Protocol is running properly.\n";
-if (('<DIST />' eq 'sles15') || ('<DIST />' eq 'centos8') || ('<DIST />' eq 'rhes8')) {
+if (('<DIST />' eq 'sles15') || ('<DIST />' eq 'centos8') || ('<DIST />' eq 'rhes8') || ('<DIST />' eq 'oracle7')) {
print "For more information on chronyd please see https://chrony.tuxfamily.org/\n";
} else {
print "For more information on ntpd please see http://www.ntp.org/\n";
@@ -57,11 +57,12 @@
('<DIST />' eq 'centos7') || ('<DIST />' eq 'rhes7') ||
('<DIST />' eq 'scientific7') || ('<DIST />' eq 'sles12') ||
('<DIST />' eq 'sles15') || ('<DIST />' eq 'ubuntu18') ||
- ('<DIST />' eq 'rhes8') || ('<DIST />' eq 'centos8')) {
+ ('<DIST />' eq 'rhes8') || ('<DIST />' eq 'centos8') ||
+ ('<DIST />' eq 'oracle7')) {
$NTPD = 'ntpd';
if ('<DIST />' eq 'ubuntu18') {
$NTPD = 'ntp';
- } elsif (('<DIST />' eq 'sles15') || ('<DIST />' eq 'rhes8') || ('<DIST />' eq 'centos8')) {
+ } elsif (('<DIST />' eq 'sles15') || ('<DIST />' eq 'rhes8') || ('<DIST />' eq 'centos8') || ('<DIST />' eq 'oracle7')) {
$NTPD = 'chronyd';
$name = $NTPD;
}
@@ -114,7 +115,8 @@
('<DIST />' eq 'centos7') || ('<DIST />' eq 'rhes7') ||
('<DIST />' eq 'scientific7') || ('<DIST />' eq 'sles12') ||
('<DIST />' eq 'sles15') || ('<DIST />' eq 'ubuntu18') ||
- ('<DIST />' eq 'rhes8') || ('<DIST />' eq 'centos8')) {
+ ('<DIST />' eq 'rhes8') || ('<DIST />' eq 'centos8') ||
+ ('<DIST />' eq 'oracle7')) {
if (!-l "/etc/systemd/system/multi-user.target.wants/$NTPD.service") {
print "**** WARNING: $NTPD is not configured to run at boot. To correct this run:\nsystemctl enable $NTPD.service\n";
}
Index: doc/loncapafiles/picins_check.piml
diff -u doc/loncapafiles/picins_check.piml:1.39 doc/loncapafiles/picins_check.piml:1.40
--- doc/loncapafiles/picins_check.piml:1.39 Mon May 27 01:26:26 2019
+++ doc/loncapafiles/picins_check.piml Tue Jul 2 19:40:13 2019
@@ -3,7 +3,7 @@
<!-- picins_check.piml -->
<!-- Stuart Raeburn -->
-<!-- $Id: picins_check.piml,v 1.39 2019/05/27 01:26:26 raeburn Exp $ -->
+<!-- $Id: picins_check.piml,v 1.40 2019/07/02 19:40:13 raeburn Exp $ -->
<!--
@@ -32,7 +32,7 @@
<piml>
<files>
<file>
-<perlscript mode="fg" dist="fedora9 fedora10 fedora11 fedora12 fedora13 fedora14 fedora15 fedora16 fedora17 fedora18 fedora19 fedora20 fedora21 fedora22 fedora 23 fedora24 fedora25 fedora26 fedora27 fedora28 fedora29 fedora30 rhes6 scientific6 centos6 rhes7 scientific7 centos7 rhes8 centos8 sles11 sles12 sles15 suse11.1 suse11.2 suse11.3 suse11.4 suse12.1 suse12.2 suse12.3 suse13.1 suse13.2 debian5 debian6 ubuntu8 ubuntu10 ubuntu12 ubuntu14 ubuntu16 ubuntu18">
+<perlscript mode="fg" dist="fedora9 fedora10 fedora11 fedora12 fedora13 fedora14 fedora15 fedora16 fedora17 fedora18 fedora19 fedora20 fedora21 fedora22 fedora 23 fedora24 fedora25 fedora26 fedora27 fedora28 fedora29 fedora30 rhes6 scientific6 centos6 rhes7 scientific7 centos7 oracle7 rhes8 centos8 sles11 sles12 sles15 suse11.1 suse11.2 suse11.3 suse11.4 suse12.1 suse12.2 suse12.3 suse13.1 suse13.2 debian5 debian6 ubuntu8 ubuntu10 ubuntu12 ubuntu14 ubuntu16 ubuntu18">
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.44 doc/loncapafiles/rpmcheck.piml:1.45
--- doc/loncapafiles/rpmcheck.piml:1.44 Mon May 27 02:01:41 2019
+++ doc/loncapafiles/rpmcheck.piml Tue Jul 2 19:40:13 2019
@@ -3,7 +3,7 @@
<!-- phpcheck.piml -->
<!-- Matthew Hall -->
-<!-- $Id: rpmcheck.piml,v 1.44 2019/05/27 02:01:41 raeburn Exp $ -->
+<!-- $Id: rpmcheck.piml,v 1.45 2019/07/02 19:40:13 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 fedora18 fedora19 fedora20 fedora21 fedora22 fedora23 fedora24 fedora25 fedora26 fedora27 fedora28 fedora29 fedora30 rhes5 rhes6 rhes7 rhes8 centos5 scientific5 scientific6 centos6 scientific7 centos7 centos8 suse9.2 suse9.3 suse10.1 suse10.2 suse10.3 sles9 sles10 sles11 sles12 sles15 suse11.1 suse11.2 suse11.3 suse11.4 suse12.1 suse12.2 suse12.3 suse13.1 suse13.2" mode="fg">
+<perlscript dist="fedora1 fedora2 fedora3 fedora4 fedora5 fedora6 fedora7 fedora8 fedora9 fedora10 fedora11 fedora12 fedora13 fedora14 fedora15 fedora16 fedora17 fedora18 fedora19 fedora20 fedora21 fedora22 fedora23 fedora24 fedora25 fedora26 fedora27 fedora28 fedora29 fedora30 rhes5 rhes6 rhes7 rhes8 centos5 scientific5 scientific6 centos6 scientific7 centos7 oracle7 centos8 suse9.2 suse9.3 suse10.1 suse10.2 suse10.3 sles9 sles10 sles11 sles12 sles15 suse11.1 suse11.2 suse11.3 suse11.4 suse12.1 suse12.2 suse12.3 suse13.1 suse13.2" mode="fg">
my $hasprereqs = 0;
if (open(PIPE,"rpm -q LONCAPA-prerequisites|")) {
my @lines = (<PIPE>);
Index: doc/loncapafiles/webserver.piml
diff -u doc/loncapafiles/webserver.piml:1.46 doc/loncapafiles/webserver.piml:1.47
--- doc/loncapafiles/webserver.piml:1.46 Sat Apr 13 04:24:26 2019
+++ doc/loncapafiles/webserver.piml Tue Jul 2 19:40:13 2019
@@ -2,7 +2,7 @@
"http://lpml.sourceforge.net/DTD/piml.dtd">
<!-- webserver.piml -->
-<!-- $Id: webserver.piml,v 1.46 2019/04/13 04:24:26 raeburn Exp $ -->
+<!-- $Id: webserver.piml,v 1.47 2019/07/02 19:40:13 raeburn Exp $ -->
<!--
@@ -49,7 +49,7 @@
<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'>/etc/apache2/default-server.conf</target>
<target dist='debian5 debian6 ubuntu6 ubuntu8 ubuntu10 ubuntu12'>/etc/apache2/sites-available/loncapa</target>
<target dist='ubuntu14 ubuntu16 ubuntu18'>/etc/apache2/conf-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>
+<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, Oracle Linux 5, SuSE 10.1, SLES 10, Debian 5, Ubuntu LTS 8 and later distributions</note>
<dependencies dist='default'>
/etc/httpd/conf/httpd.conf
</dependencies>
Index: doc/loncapafiles/wrap_setuid.piml
diff -u doc/loncapafiles/wrap_setuid.piml:1.40 doc/loncapafiles/wrap_setuid.piml:1.41
--- doc/loncapafiles/wrap_setuid.piml:1.40 Mon May 27 01:26:26 2019
+++ doc/loncapafiles/wrap_setuid.piml Tue Jul 2 19:40:13 2019
@@ -3,7 +3,7 @@
<!-- wrap_setuid.piml -->
<!-- Guy Albertelli -->
-<!-- $Id: wrap_setuid.piml,v 1.40 2019/05/27 01:26:26 raeburn Exp $ -->
+<!-- $Id: wrap_setuid.piml,v 1.41 2019/07/02 19:40:13 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 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 fedora14 fedora15 fedora16 fedora17 fedora18 fedora19 fedora20 fedora21 fedora22 fedora23 fedora24 fedora25 fedora26 fedora27 fedora28 fedora29 fedora30 ubuntu12 ubuntu14 ubuntu16 ubuntu18 rhes7 centos7 scientific7 rhes8 centos8">
+<perlscript mode="fg" dist="suse9.2 suse9.3 sles9 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 fedora14 fedora15 fedora16 fedora17 fedora18 fedora19 fedora20 fedora21 fedora22 fedora23 fedora24 fedora25 fedora26 fedora27 fedora28 fedora29 fedora30 ubuntu12 ubuntu14 ubuntu16 ubuntu18 rhes7 centos7 scientific7 oracle7 rhes8 centos8">
$fslist='<TARGET />';
open(FIND, "find <TARGET /> -xdev -type f \\( -perm -04000 -o -perm -02000 \\) -print|");
Index: loncom/lond
diff -u loncom/lond:1.558 loncom/lond:1.559
--- loncom/lond:1.558 Fri Apr 26 20:22:10 2019
+++ loncom/lond Tue Jul 2 19:40:18 2019
@@ -2,7 +2,7 @@
# The LearningOnline Network
# lond "LON Daemon" Server (port "LOND" 5663)
#
-# $Id: lond,v 1.558 2019/04/26 20:22:10 raeburn Exp $
+# $Id: lond,v 1.559 2019/07/02 19:40:18 raeburn Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -65,7 +65,7 @@
my $status='';
my $lastlog='';
-my $VERSION='$Revision: 1.558 $'; #' stupid emacs
+my $VERSION='$Revision: 1.559 $'; #' stupid emacs
my $remoteVERSION;
my $currenthostid="default";
my $currentdomainid;
@@ -2030,7 +2030,7 @@
}
if ($what eq 'perlvar') {
if (!exists($packagevars{$what}{'lonBalancer'})) {
- if ($dist =~ /^(centos|rhes|fedora|scientific)/) {
+ if ($dist =~ /^(centos|rhes|fedora|scientific|oracle)/) {
my $othervarref=LONCAPA::Configuration::read_conf('httpd.conf');
if (ref($othervarref) eq 'HASH') {
$items->{'lonBalancer'} = $othervarref->{'lonBalancer'};
@@ -7542,7 +7542,7 @@
&Authen::Krb5::init_context();
my $no_ets;
- if ($dist =~ /^(?:centos|rhes|scientific)(\d+)$/) {
+ if ($dist =~ /^(?:centos|rhes|scientific|oracle)(\d+)$/) {
if ($1 >= 7) {
$no_ets = 1;
}
Index: loncom/configuration/Firewall.pm
diff -u loncom/configuration/Firewall.pm:1.18 loncom/configuration/Firewall.pm:1.19
--- loncom/configuration/Firewall.pm:1.18 Sun Jun 9 02:35:45 2019
+++ loncom/configuration/Firewall.pm Tue Jul 2 19:40:22 2019
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# Firewall configuration to allow internal LON-CAPA communication between servers
#
-# $Id: Firewall.pm,v 1.18 2019/06/09 02:35:45 raeburn Exp $
+# $Id: Firewall.pm,v 1.19 2019/07/02 19:40:22 raeburn Exp $
#
# The LearningOnline Network with CAPA
#
@@ -51,7 +51,7 @@
if ($1 >= 18) {
$checkfirewalld = 1;
}
- } elsif ($distro =~ /^(?:centos|rhes|scientific)(\d+)/) {
+ } elsif ($distro =~ /^(?:centos|rhes|scientific|oracle)(\d+)/) {
if ($1 >= 7) {
$checkfirewalld = 1;
}
@@ -640,8 +640,8 @@
my $firewalld = &uses_firewalld($distro);
if ($firewalld) {
my ($dist,$version) = ($distro =~ /^([\D]+)(\d+)$/);
- if ((($dist eq 'rhes') || ($dist eq 'centos')) &&
- ($version >= 8)) {
+ if (((($dist eq 'rhes') || ($dist eq 'centos')) &&
+ ($version >= 8)) || (($dist eq 'oracle') && ($version >= 7))) {
push(@fw_chains,'INPUT');
} else {
my $zone = &get_default_zone();
@@ -660,7 +660,7 @@
} else {
if ($distro =~ /^(debian|ubuntu|suse|sles)/) {
@posschains = ('INPUT');
- } elsif ($distro =~ /^(fedora|rhes|centos|scientific)(\d+)$/) {
+ } elsif ($distro =~ /^(fedora|rhes|centos|scientific|oracle)(\d+)$/) {
if ((($1 eq 'fedora') && ($2 > 15)) || (($1 ne 'fedora') && ($2 >= 7))) {
@posschains = ('INPUT');
} else {
@@ -673,7 +673,7 @@
print("Unable to find iptables file containing static definitions.\n");
}
}
- if ($distro =~ /^(fedora|rhes|centos|scientific)(\d+)$/) {
+ if ($distro =~ /^(fedora|rhes|centos|scientific|oracle)(\d+)$/) {
unless ((($1 eq 'fedora') && ($2 > 15)) || (($1 ne 'fedora') && ($2 >= 7))) {
push(@fw_chains,'RH-Firewall-1-INPUT');
}
Index: loncom/debugging_tools/modify_config_files.pl
diff -u loncom/debugging_tools/modify_config_files.pl:1.14 loncom/debugging_tools/modify_config_files.pl:1.15
--- loncom/debugging_tools/modify_config_files.pl:1.14 Fri Oct 26 21:39:44 2018
+++ loncom/debugging_tools/modify_config_files.pl Tue Jul 2 19:40:27 2019
@@ -2,7 +2,7 @@
#
# The LearningOnline Network
#
-# $Id: modify_config_files.pl,v 1.14 2018/10/26 21:39:44 raeburn Exp $
+# $Id: modify_config_files.pl,v 1.15 2019/07/02 19:40:27 raeburn Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -112,7 +112,7 @@
key => 'gpgkey=',
value => $gpg,
}],$nobackup);
-} elsif ($dist =~ /^(rhes|centos|scientific)(\d+)$/) {
+} elsif ($dist =~ /^(rhes|centos|scientific|oracle)(\d+)$/) {
my $type = $1;
my $ver = $2;
my $longver = $ver;
@@ -142,6 +142,12 @@
gpg => 'versions/scientific/RPM-GPG-KEY-loncapa',
gpgchk => 1,
},
+ oracle => {
+ title => 'Oracle Linux',
+ path => 'oracle/loncapa',
+ gpg => 'versions/oracle/RPM-GPG-KEY-loncapa',
+ gpgchk => 1,
+ },
);
if (ref($info{$type}) eq 'HASH') {
if ($ver > 4) {
Index: loncom/build/distprobe
diff -u loncom/build/distprobe:1.22 loncom/build/distprobe:1.23
--- loncom/build/distprobe:1.22 Mon May 27 01:26:31 2019
+++ loncom/build/distprobe Tue Jul 2 19:40:31 2019
@@ -2,7 +2,7 @@
#
# The LearningOnline Network with CAPA
#
-# $Id: distprobe,v 1.22 2019/05/27 01:26:31 raeburn Exp $
+# $Id: distprobe,v 1.23 2019/07/02 19:40:31 raeburn Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -29,7 +29,15 @@
my $dist='default';
my $unknown;
-if (-e '/etc/redhat-release') {
+if (-e '/etc/oracle-release') {
+ open(IN,'</etc/oracle-release');
+ my $versionstring=<IN>;
+ chomp($versionstring);
+ close(IN);
+ if ($versionstring =~ /^Oracle Linux Server release (\d+)/) {
+ $dist = 'oracle'.$1;
+ }
+} elsif (-e '/etc/redhat-release') {
open(IN,'</etc/redhat-release');
my $versionstring=<IN>;
chomp($versionstring);
Index: loncom/build/Makefile
diff -u loncom/build/Makefile:1.214 loncom/build/Makefile:1.215
--- loncom/build/Makefile:1.214 Sun Jun 9 03:10:16 2019
+++ loncom/build/Makefile Tue Jul 2 19:40:31 2019
@@ -1,6 +1,6 @@
# The LearningOnline Network with CAPA
-# $Id: Makefile,v 1.214 2019/06/09 03:10:16 raeburn Exp $
+# $Id: Makefile,v 1.215 2019/07/02 19:40:31 raeburn Exp $
# TYPICAL USAGE of this Makefile is primarily for two targets:
# "make build" and "make install".
@@ -57,11 +57,12 @@
help_OPTIONS:
@echo "* ADJUSTABLE OPTIONS *"
@echo "(option) DIST can be centosN (N = 5, 6 or 7), rhesN (N = 4, 5, 6, 7 or 8),"
- @echo " or scientificN (N = 5, 6 or 7), or slesN (N = 9, 10, 11, 12 or 15),"
+ @echo " scientificN (N = 5, 6 or 7), oracleN (N = 5, 6, or 7)"
+ @echo " or slesN (N = 9, 10, 11, 12 or 15), or debianN (N = 5 or 6),"
@echo " or ubuntuN (N= 6, 8, 10, 12, 14, 16 or 18), or fedoraN (N = 1 .. 30),"
- @echo " or suseN.M (N.M: 9.2 .. 13.2), or debianN (N = 5 or 6),"
- @echo " or default. It is unlikely you would ever need to specify"
- @echo " this, as it is automatically probed for."
+ @echo " or suseN.M (N.M: 9.2 .. 13.2), or default.
+ @echo " It is unlikely you would ever need to specify this,"
+ @echo " as it is automatically probed for."
@echo "(option) CATEGORY can be 'runtime' or 'development'; currently"
@echo " the 'development' setting is the most reliable;"
@echo " eventually, production machines should be using the"
Index: doc/install/linux/install.pl
diff -u doc/install/linux/install.pl:1.54 doc/install/linux/install.pl:1.55
--- doc/install/linux/install.pl:1.54 Sun May 26 22:23:25 2019
+++ doc/install/linux/install.pl Tue Jul 2 19:40:35 2019
@@ -77,7 +77,7 @@
&mt('Stopping execution.')."\n";
exit;
} else {
- print LOG '$Id: install.pl,v 1.54 2019/05/26 22:23:25 raeburn Exp $'."\n";
+ print LOG '$Id: install.pl,v 1.55 2019/07/02 19:40:35 raeburn Exp $'."\n";
}
#
@@ -166,7 +166,18 @@
sub get_distro {
my ($distro,$gotprereqs,$updatecmd,$packagecmd,$installnow,$unknown);
$packagecmd = '/bin/rpm -q LONCAPA-prerequisites ';
- if (-e '/etc/redhat-release') {
+ if (-e '/etc/oracle-release') {
+ open(IN,'</etc/oracle-release');
+ my $versionstring=<IN>;
+ chomp($versionstring);
+ close(IN);
+ if ($versionstring =~ /^Oracle Linux Server release (\d+)/) {
+ my $version = $1;
+ $distro = 'oracle'.$1;
+ $updatecmd = 'yum install LONCAPA-prerequisites';
+ $installnow = 'yum -y install LONCAPA-prerequisites';
+ }
+ } elsif (-e '/etc/redhat-release') {
open(IN,'</etc/redhat-release');
my $versionstring=<IN>;
chomp($versionstring);
@@ -312,7 +323,7 @@
$unknown = 1;
}
} else {
- print &mt('Unknown installation: expecting a debian, ubuntu, suse, sles, redhat, fedora or scientific linux system.')."\n";
+ print &mt('Unknown installation: expecting a debian, ubuntu, suse, sles, redhat, fedora, scientific linux, or oracle linux system.')."\n";
}
}
return ($distro,$packagecmd,$updatecmd,$installnow);
More information about the LON-CAPA-cvs
mailing list