Commit c5baff90 authored by Nigel Kukard's avatar Nigel Kukard

Merge branch 'apache2fix' into 'master'

Fixed issue with apache default sites being picked up

See merge request !8
parents 432103cf b8e5f9ee
Pipeline #918 passed with stages
in 3 minutes and 5 seconds
......@@ -47,7 +47,7 @@ package AWIT::CertMaster;
use strict;
use warnings;
our $VERSION = '1.04';
our $VERSION = '1.05';
BEGIN {
......@@ -237,10 +237,16 @@ sub webserverCheckApache
foreach my $vhostName (keys %{$vhostConfig}) {
my $vhost = $vhostConfig->{$vhostName};
# Skip over system configurations
next if ($vhost =~ /default(|-ssl)/);
# Skip over backup files
next if ($vhost =~ /\.bak$/);
# Skip over a few things
if (
# Skip over system configurations
$vhostName =~ /default(|-ssl)/ ||
# Skip over backup files
$vhostName =~ /\.bak$/
) {
delete($vhostConfig->{$vhostName});
next;
}
$self->logger("INFO","APACHE: Processing vhost '%s'",$vhostName);
# Open config file
......@@ -1776,7 +1782,7 @@ use Getopt::Long;
my $NAME = "AWIT-CertMaster";
our $VERSION = "1.1.7";
our $VERSION = "1.1.8";
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment