Removed calls to check apache config.

Signed-off-by: digimer <mkelly@alteeve.ca>
main
digimer 11 months ago
parent e03219d1d8
commit b0cede49e3
  1. 2
      Anvil/Tools/Striker.pm
  2. 7
      tools/anvil-configure-host
  3. 8
      tools/anvil-daemon

@ -14,7 +14,7 @@ our $VERSION = "3.0.0";
my $THIS_FILE = "Striker.pm"; my $THIS_FILE = "Striker.pm";
### Methods; ### Methods;
# check_httpd_conf # check_httpd_conf - Deprecated
# generate_manifest # generate_manifest
# get_fence_data # get_fence_data
# get_local_repo # get_local_repo

@ -354,13 +354,6 @@ sub reconfigure_network
} }
} }
### NOTE: No longer needed, we don't use apache anymore.
# If we're a striker, check apache's config.
if ($type eq "striker")
{
#$anvil->Striker->check_httpd_conf({debug => 2});
}
# Now configure the network. # Now configure the network.
my $dns = $anvil->data->{config}{dns} ? [split/,/, $anvil->data->{config}{dns}] : []; my $dns = $anvil->data->{config}{dns} ? [split/,/, $anvil->data->{config}{dns}] : [];
$anvil->Log->variables({source => $THIS_FILE, line => __LINE__, level => 3, list => { dns => $dns }}); $anvil->Log->variables({source => $THIS_FILE, line => __LINE__, level => 3, list => { dns => $dns }});

@ -1365,14 +1365,6 @@ AND
# Check the firewall needs to be updated. # Check the firewall needs to be updated.
check_firewall($anvil); check_firewall($anvil);
# If we're a striker, check striker-ui-api
my $host_type = $anvil->Get->host_type;
$anvil->Log->variables({source => $THIS_FILE, line => __LINE__, level => 2, list => { host_type => $host_type }});
if ($host_type eq "striker")
{
$anvil->Striker->check_httpd_conf({debug => 3});
}
return(0); return(0);
} }

Loading…
Cancel
Save