From b8e5f9eeca35c365c3221a9ced956ab20f21f6dc Mon Sep 17 00:00:00 2001 From: Nigel Kukard Date: Sun, 22 Jan 2017 14:27:48 +0000 Subject: [PATCH] Fixed issue with apache default sites being picked up --- awit-certmaster | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) diff --git a/awit-certmaster b/awit-certmaster index c97c089..fd3a3a6 100755 --- a/awit-certmaster +++ b/awit-certmaster @@ -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"; -- GitLab