--- loncom/configuration/Firewall.pm 2019/06/09 02:35:45 1.18 +++ loncom/configuration/Firewall.pm 2019/07/02 19:40:22 1.19 @@ -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 @@ sub uses_firewalld { 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 @@ sub get_fw_chains { 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 @@ sub get_fw_chains { } 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 @@ sub get_fw_chains { 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'); }