[LON-CAPA-cvs] cvs: doc(version_2_11_X) /install/linux install.pl
raeburn
raeburn at source.lon-capa.org
Tue Dec 21 11:07:53 EST 2021
raeburn Tue Dec 21 16:07:53 2021 EDT
Modified files: (Branch: version_2_11_X)
/doc/install/linux install.pl
Log:
- For 2.11
Backport 1.79, 1.80, 1.81, 1.82
Index: doc/install/linux/install.pl
diff -u doc/install/linux/install.pl:1.45.2.17 doc/install/linux/install.pl:1.45.2.18
--- doc/install/linux/install.pl:1.45.2.17 Fri Dec 10 15:31:47 2021
+++ doc/install/linux/install.pl Tue Dec 21 16:07:53 2021
@@ -76,7 +76,7 @@
&mt('Stopping execution.')."\n";
exit;
} else {
- print LOG '$Id: install.pl,v 1.45.2.17 2021/12/10 15:31:47 raeburn Exp $'."\n";
+ print LOG '$Id: install.pl,v 1.45.2.18 2021/12/21 16:07:53 raeburn Exp $'."\n";
}
#
@@ -210,8 +210,11 @@
$distro = 'rhes'.$1;
$updatecmd = 'dnf install LONCAPA-prerequisites';
$installnow = 'dnf -y install LONCAPA-prerequisites';
- } elsif ($versionstring =~ /CentOS(?:| Linux| Stream) release (\d+)/) {
- $distro = 'centos'.$1;
+ } elsif ($versionstring =~ /CentOS(| Linux| Stream) release (\d+)/) {
+ $distro = 'centos'.$2;
+ if ($1 eq ' Stream') {
+ $distro .= '-stream';
+ }
$updatecmd = 'yum install LONCAPA-prerequisites';
$installnow = 'yum -y install LONCAPA-prerequisites';
} elsif ($versionstring =~ /Scientific Linux (?:SL )?release ([\d.]+) /) {
@@ -220,6 +223,18 @@
$distro = 'scientific'.$ver;
$updatecmd = 'yum install LONCAPA-prerequisites';
$installnow = 'yum -y install LONCAPA-prerequisites';
+ } elsif ($versionstring =~ /Rocky Linux release ([\d.]+)/) {
+ my $ver = $1;
+ $ver =~ s/\.\d+$//;
+ $distro = 'rocky'.$ver;
+ $updatecmd = 'dnf install LONCAPA-prerequisites';
+ $installnow = 'dnf -y install LONCAPA-prerequisites';
+ } elsif ($versionstring =~ /AlmaLinux release ([\d.]+) /) {
+ my $ver = $1;
+ $ver =~ s/\.\d+$//;
+ $distro = 'alma'.$ver;
+ $updatecmd = 'dnf install LONCAPA-prerequisites';
+ $installnow = 'dnf -y install LONCAPA-prerequisites';
} else {
print &mt('Unable to interpret [_1] to determine system type.',
'/etc/redhat-release')."\n";
@@ -393,7 +408,7 @@
'/etc/sysconfig/i18n');
$earlyout = 1;
}
- } elsif ($distro =~ /^(?:rhes|centos|scientific|oracle)(\d+)/) {
+ } elsif ($distro =~ /^(?:rhes|centos|scientific|oracle|rocky|alma)(\d+)/) {
if ($1 >= 7) {
if (!open($fh,"</etc/locale.conf")) {
print &mt('Failed to open: [_1], default locale not checked.',
@@ -532,7 +547,7 @@
if ($1 >= 34) {
$process = 'mariadb';
}
- } elsif ($distro =~ /^(?:centos|rhes|scientific|oracle)(\d+)/) {
+ } elsif ($distro =~ /^(?:centos|rhes|scientific|oracle|rocky|alma)(\d+)/) {
if ($1 >= 7) {
$mysqldaemon ='mariadb';
$process = 'mysqld';
@@ -679,7 +694,7 @@
if ($version >= 26) {
$daemon{'ntp'} = 'chronyd';
}
- } elsif ($distro =~ /^(?:centos|rhes|scientific|oracle)(\d+)/) {
+ } elsif ($distro =~ /^(?:centos|rhes|scientific|oracle|rocky|alma)(\d+)/) {
my $version = $1;
if ($version >= 7) {
$uses_systemctl{'ntp'} = 1;
@@ -795,7 +810,7 @@
if ($1 >= 18) {
$checkfirewalld = 1;
}
- } elsif ($distro =~ /^(?:centos|rhes|scientific|oracle)(\d+)/) {
+ } elsif ($distro =~ /^(?:centos|rhes|scientific|oracle|rocky|alma)(\d+)/) {
if ($1 >= 7) {
$checkfirewalld = 1;
}
@@ -988,7 +1003,7 @@
} else {
my $configfile = 'httpd.conf';
my $mpmfile = 'mpm.conf';
- if ($distro =~ /^(?:centos|rhes|scientific|oracle)(\d+)$/) {
+ if ($distro =~ /^(?:centos|rhes|scientific|oracle|rocky|alma)(\d+)/) {
if ($1 >= 7) {
$configfile = 'apache2.4/httpd.conf';
} elsif ($1 > 5) {
@@ -1810,7 +1825,7 @@
'ssh, http')."\n";
} else {
my $version;
- if ($distro =~ /^(redhat|centos)(\d+)$/) {
+ if ($distro =~ /^(redhat|centos|rocky|alma)(\d+)/) {
$version = $1;
}
if ($version > 5) {
@@ -1890,7 +1905,7 @@
if ($1 > 6) {
$lc_uses_systemctl = 1;
}
- } elsif ($distro =~ /^(?:rhes|centos)(\d+)$/) {
+ } elsif ($distro =~ /^(?:rhes|centos|rocky|alma)(\d+)/) {
if ($1 > 7) {
$lc_uses_systemctl = 1;
}
@@ -2323,7 +2338,7 @@
sub copy_httpd_conf {
my ($instdir,$distro) = @_;
my $configfile = 'httpd.conf';
- if ($distro =~ /^(?:centos|rhes|scientific|oracle)(\d+)$/) {
+ if ($distro =~ /^(?:centos|rhes|scientific|oracle|rocky|alma)(\d+)/) {
if ($1 >= 7) {
$configfile = 'apache2.4/httpd.conf';
} elsif ($1 > 5) {
@@ -2370,7 +2385,7 @@
print_and_log("\n");
} else {
my $logfail;
- if ($distro =~ /^(?:centos|rhes|scientific|oracle)(\d+)$/) {
+ if ($distro =~ /^(?:centos|rhes|scientific|oracle|rocky|alma)(\d+)/) {
if ($1 > 7) {
$logfail = 1;
}
More information about the LON-CAPA-cvs
mailing list