--- doc/install/linux/install.pl	2021/07/28 13:37:10	1.78
+++ doc/install/linux/install.pl	2023/04/28 19:33:48	1.83
@@ -78,7 +78,7 @@ if (!open(LOG,">>loncapa_install.log"))
           &mt('Stopping execution.')."\n";
     exit;
 } else {
-    print LOG '$Id: install.pl,v 1.78 2021/07/28 13:37:10 raeburn Exp $'."\n";
+    print LOG '$Id: install.pl,v 1.83 2023/04/28 19:33:48 raeburn Exp $'."\n";
 }
 
 #
@@ -212,8 +212,11 @@ sub get_distro {
             $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.]+) /) {
@@ -222,6 +225,18 @@ sub get_distro {
             $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";
@@ -457,7 +472,7 @@ sub check_locale {
                       '/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.',
@@ -619,13 +634,16 @@ sub check_mysql_running {
         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';
             $proc_owner = 'mysql';
             $use_systemctl = 1;
         }
+        if ($1 >= 9) {
+            $process = 'mariadb';
+        }
     } elsif ($distro =~ /^sles(\d+)/) {
         if ($1 >= 12) {
             $use_systemctl = 1;
@@ -766,7 +784,7 @@ sub chkconfig {
         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;
@@ -882,7 +900,7 @@ sub uses_firewalld {
         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;
         }
@@ -1075,7 +1093,7 @@ sub chkapache {
     } 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) {
@@ -2225,7 +2243,7 @@ if ($callsub{'firewall'}) {
                   'ssh, http')."\n";
     } else {
         my $version;
-        if ($distro =~ /^(redhat|centos)(\d+)$/) {
+        if ($distro =~ /^(redhat|centos)(\d+)/) {
             $version = $1;
         }
         if ($version > 5) {
@@ -2306,7 +2324,7 @@ if ($have_tarball && !$updateshown) {
         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;
         }
@@ -2739,7 +2757,7 @@ sub get_mysql_version {
 sub copy_httpd_conf {
     my ($instdir,$distro,$hostname) = @_;
     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) {
@@ -2786,7 +2804,7 @@ sub copy_mpm_conf {
         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;
             }