From f55d60527058347bccd7ace3c333be57e5e9ecfa Mon Sep 17 00:00:00 2001 From: Digimer Date: Thu, 30 Jun 2022 10:04:55 -0400 Subject: [PATCH] * Disabled the new firewall management to prepare for a new merge with main. Needed to resolve in-field client issues. Signed-off-by: Digimer --- Anvil/Tools/Network.pm | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/Anvil/Tools/Network.pm b/Anvil/Tools/Network.pm index b06e9636..29390efe 100644 --- a/Anvil/Tools/Network.pm +++ b/Anvil/Tools/Network.pm @@ -244,6 +244,7 @@ sub check_firewall my $debug = defined $parameter->{debug} ? $parameter->{debug} : 3; $anvil->Log->entry({source => $THIS_FILE, line => __LINE__, level => $debug, key => "log_0125", variables => { method => "Network->check_firewall()" }}); + my $running = 0; # Make sure firewalld is running. @@ -256,7 +257,8 @@ sub check_firewall } else { - if ($anvil->data->{sys}{daemons}{restart_firewalld}) + #if ($anvil->data->{sys}{daemons}{restart_firewalld}) + if (0) { $anvil->Log->entry({source => $THIS_FILE, line => __LINE__, level => 0, priority => "err", key => "log_0127"}); my $return_code = $anvil->System->start_daemon({daemon => $anvil->data->{sys}{daemon}{firewalld}}); @@ -276,7 +278,7 @@ sub check_firewall else { # We've been asked to leave it off. - $anvil->Log->entry({source => $THIS_FILE, line => __LINE__, level => 0, priority => "err", key => "log_0128"}); + $anvil->Log->entry({source => $THIS_FILE, line => __LINE__, level => 2, priority => "err", key => "log_0128"}); return(0); } } @@ -2946,6 +2948,8 @@ sub manage_firewall my $debug = defined $parameter->{debug} ? $parameter->{debug} : 3; $anvil->Log->entry({source => $THIS_FILE, line => __LINE__, level => $debug, key => "log_0125", variables => { method => "Network->manage_firewall()" }}); + return(1); + my $task = defined $parameter->{task} ? $parameter->{task} : "check"; my $port_number = defined $parameter->{port_number} ? $parameter->{port_number} : ""; my $protocol = defined $parameter->{protocol} ? $parameter->{protocol} : "tcp";