doc/install/linux/install.pl - diff

Return to install.pl CVS log

Up to [LON-CAPA] / doc / install / linux

Diff for /doc/install/linux/install.pl between versions 1.45.2.16 and 1.45.2.18

version 1.45.2.16, 2021/03/29 03:50:33	version 1.45.2.18, 2021/12/21 16:07:53
Line 210 sub get_distro {	Line 210 sub get_distro {
$distro = 'rhes'.$1;	$distro = 'rhes'.$1;
$updatecmd = 'dnf install LONCAPA-prerequisites';	$updatecmd = 'dnf install LONCAPA-prerequisites';
$installnow = 'dnf -y install LONCAPA-prerequisites';	$installnow = 'dnf -y install LONCAPA-prerequisites';
} elsif ($versionstring =~ /CentOS(?:\| Linux\| Stream) release (\d+)/) {	} elsif ($versionstring =~ /CentOS(\| Linux\| Stream) release (\d+)/) {
$distro = 'centos'.$1;	$distro = 'centos'.$2;
	if ($1 eq ' Stream') {
	$distro .= '-stream';
	}
$updatecmd = 'yum install LONCAPA-prerequisites';	$updatecmd = 'yum install LONCAPA-prerequisites';
$installnow = 'yum -y install LONCAPA-prerequisites';	$installnow = 'yum -y install LONCAPA-prerequisites';
} elsif ($versionstring =~ /Scientific Linux (?:SL )?release ([\d.]+) /) {	} elsif ($versionstring =~ /Scientific Linux (?:SL )?release ([\d.]+) /) {
Line 220 sub get_distro {	Line 223 sub get_distro {
$distro = 'scientific'.$ver;	$distro = 'scientific'.$ver;
$updatecmd = 'yum install LONCAPA-prerequisites';	$updatecmd = 'yum install LONCAPA-prerequisites';
$installnow = 'yum -y 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 {	} else {
print &mt('Unable to interpret [_1] to determine system type.',	print &mt('Unable to interpret [_1] to determine system type.',
'/etc/redhat-release')."\n";	'/etc/redhat-release')."\n";
Line 393 sub check_locale {	Line 408 sub check_locale {
'/etc/sysconfig/i18n');	'/etc/sysconfig/i18n');
$earlyout = 1;	$earlyout = 1;
}	}
} elsif ($distro =~ /^(?:rhes\|centos\|scientific\|oracle)(\d+)/) {	} elsif ($distro =~ /^(?:rhes\|centos\|scientific\|oracle\|rocky\|alma)(\d+)/) {
if ($1 >= 7) {	if ($1 >= 7) {
if (!open($fh,"</etc/locale.conf")) {	if (!open($fh,"</etc/locale.conf")) {
print &mt('Failed to open: [_1], default locale not checked.',	print &mt('Failed to open: [_1], default locale not checked.',
Line 529 sub check_mysql_running {	Line 544 sub check_mysql_running {
if ($1 >= 19) {	if ($1 >= 19) {
$mysqldaemon ='mariadb';	$mysqldaemon ='mariadb';
}	}
} elsif ($distro =~ /^(?:centos\|rhes\|scientific\|oracle)(\d+)/) {	if ($1 >= 34) {
	$process = 'mariadb';
	}
	} elsif ($distro =~ /^(?:centos\|rhes\|scientific\|oracle\|rocky\|alma)(\d+)/) {
if ($1 >= 7) {	if ($1 >= 7) {
$mysqldaemon ='mariadb';	$mysqldaemon ='mariadb';
$process = 'mysqld';	$process = 'mysqld';
Line 676 sub chkconfig {	Line 694 sub chkconfig {
if ($version >= 26) {	if ($version >= 26) {
$daemon{'ntp'} = 'chronyd';	$daemon{'ntp'} = 'chronyd';
}	}
} elsif ($distro =~ /^(?:centos\|rhes\|scientific\|oracle)(\d+)/) {	} elsif ($distro =~ /^(?:centos\|rhes\|scientific\|oracle\|rocky\|alma)(\d+)/) {
my $version = $1;	my $version = $1;
if ($version >= 7) {	if ($version >= 7) {
$uses_systemctl{'ntp'} = 1;	$uses_systemctl{'ntp'} = 1;
Line 792 sub uses_firewalld {	Line 810 sub uses_firewalld {
if ($1 >= 18) {	if ($1 >= 18) {
$checkfirewalld = 1;	$checkfirewalld = 1;
}	}
} elsif ($distro =~ /^(?:centos\|rhes\|scientific\|oracle)(\d+)/) {	} elsif ($distro =~ /^(?:centos\|rhes\|scientific\|oracle\|rocky\|alma)(\d+)/) {
if ($1 >= 7) {	if ($1 >= 7) {
$checkfirewalld = 1;	$checkfirewalld = 1;
}	}
Line 985 sub chkapache {	Line 1003 sub chkapache {
} else {	} else {
my $configfile = 'httpd.conf';	my $configfile = 'httpd.conf';
my $mpmfile = 'mpm.conf';	my $mpmfile = 'mpm.conf';
if ($distro =~ /^(?:centos\|rhes\|scientific\|oracle)(\d+)$/) {	if ($distro =~ /^(?:centos\|rhes\|scientific\|oracle\|rocky\|alma)(\d+)/) {
if ($1 >= 7) {	if ($1 >= 7) {
$configfile = 'apache2.4/httpd.conf';	$configfile = 'apache2.4/httpd.conf';
} elsif ($1 > 5) {	} elsif ($1 > 5) {
Line 1807 if ($callsub{'firewall'}) {	Line 1825 if ($callsub{'firewall'}) {
'ssh, http')."\n";	'ssh, http')."\n";
} else {	} else {
my $version;	my $version;
if ($distro =~ /^(redhat\|centos)(\d+)$/) {	if ($distro =~ /^(redhat\|centos\|rocky\|alma)(\d+)/) {
$version = $1;	$version = $1;
}	}
if ($version > 5) {	if ($version > 5) {
Line 1887 if ($have_tarball && !$updateshown) {	Line 1905 if ($have_tarball && !$updateshown) {
if ($1 > 6) {	if ($1 > 6) {
$lc_uses_systemctl = 1;	$lc_uses_systemctl = 1;
}	}
} elsif ($distro =~ /^(?:rhes\|centos)(\d+)$/) {	} elsif ($distro =~ /^(?:rhes\|centos\|rocky\|alma)(\d+)/) {
if ($1 > 7) {	if ($1 > 7) {
$lc_uses_systemctl = 1;	$lc_uses_systemctl = 1;
}	}
Line 2320 sub get_mysql_version {	Line 2338 sub get_mysql_version {
sub copy_httpd_conf {	sub copy_httpd_conf {
my ($instdir,$distro) = @_;	my ($instdir,$distro) = @_;
my $configfile = 'httpd.conf';	my $configfile = 'httpd.conf';
if ($distro =~ /^(?:centos\|rhes\|scientific\|oracle)(\d+)$/) {	if ($distro =~ /^(?:centos\|rhes\|scientific\|oracle\|rocky\|alma)(\d+)/) {
if ($1 >= 7) {	if ($1 >= 7) {
$configfile = 'apache2.4/httpd.conf';	$configfile = 'apache2.4/httpd.conf';
} elsif ($1 > 5) {	} elsif ($1 > 5) {
Line 2367 sub copy_mpm_conf {	Line 2385 sub copy_mpm_conf {
print_and_log("\n");	print_and_log("\n");
} else {	} else {
my $logfail;	my $logfail;
if ($distro =~ /^(?:centos\|rhes\|scientific\|oracle)(\d+)$/) {	if ($distro =~ /^(?:centos\|rhes\|scientific\|oracle\|rocky\|alma)(\d+)/) {
if ($1 > 7) {	if ($1 > 7) {
$logfail = 1;	$logfail = 1;
}	}

FreeBSD-CVSweb <freebsd-cvsweb@FreeBSD.org>

Removed from v.1.45.2.16
changed lines
	Added in v.1.45.2.18