[LON-CAPA-cvs] cvs: doc(version_2_11_X) /install/linux install.pl

[raeburn]

raeburn		Thu Mar 18 22:00:54 2021 EDT

  Modified files:              (Branch: version_2_11_X)
    /doc/install/linux	install.pl 
  Log:
  - For 2.11
    Backport 1.72, 1.73
  
  
Index: doc/install/linux/install.pl
diff -u doc/install/linux/install.pl:1.45.2.12 doc/install/linux/install.pl:1.45.2.13
--- doc/install/linux/install.pl:1.45.2.12	Tue Mar 16 01:04:11 2021
+++ doc/install/linux/install.pl	Thu Mar 18 22:00:54 2021
@@ -76,7 +76,7 @@
           &mt('Stopping execution.')."\n";
     exit;
 } else {
-    print LOG '$Id: install.pl,v 1.45.2.12 2021/03/16 01:04:11 raeburn Exp $'."\n";
+    print LOG '$Id: install.pl,v 1.45.2.13 2021/03/18 22:00:54 raeburn Exp $'."\n";
 }
 
 #
@@ -210,7 +210,7 @@
             $distro = 'rhes'.$1;
             $updatecmd = 'dnf install LONCAPA-prerequisites';
             $installnow = 'dnf -y install LONCAPA-prerequisites';
-        } elsif ($versionstring =~ /CentOS(?:| Linux) release (\d+)/) {
+        } elsif ($versionstring =~ /CentOS(?:| Linux| Stream) release (\d+)/) {
             $distro = 'centos'.$1;
             $updatecmd = 'yum install LONCAPA-prerequisites';
             $installnow = 'yum -y install LONCAPA-prerequisites';
@@ -1755,14 +1755,16 @@
         if (keys(%added) > 0) {
             print &mt('Firewall configured to allow access for: [_1].',
                       join(', ',sort(keys(%added))))."\n";
+            system('firewall-cmd --reload');
         }
         if ($current{'http'} || $current{'https'}) {
             print &mt('Firewall already configured to allow access for:[_1].',
                       (($current{'http'})? ' http':'').(($current{'https'})? ' https':''))."\n";
         }
         unless ($current{'ssh'}) {
-            print &mt('If you would the like to allow access to ssh from outside, use the command[_1].',
-                  "firewall-cmd --permanent --zone=$zone --add-service=ssh")."\n";
+            print &mt('If you would like to allow access to ssh from outside, use the commands:')."\n".
+                  "firewall-cmd --permanent --zone=$zone --add-service=ssh\n".
+                  "firewall-cmd --reload\n";
         }
     } elsif ($distro =~ /^(suse|sles)/) {
         print &mt('Use [_1] to configure the firewall to allow access for [_2].',