Commit 9f5ce59c authored by Nigel Kukard's avatar Nigel Kukard

Merge branch 'pathfix' into 'master'

Added full paths to system commands, bumped version

See merge request !10
parents 14927539 70e9b995
Pipeline #946 passed with stages
in 3 minutes and 33 seconds
......@@ -47,7 +47,7 @@ package AWIT::CertMaster;
use strict;
use warnings;
our $VERSION = '1.06';
our $VERSION = '1.07';
BEGIN {
......@@ -685,7 +685,7 @@ sub _webserverReloadApache
# Check if the configtest passes
if ($self->{'live'}) {
# Check if Apache config is OK
system('apachectl configtest > /dev/null 2>&1');
system('/usr/sbin/apachectl configtest > /dev/null 2>&1');
if ($? >> 8) {
$self->logger("ERROR","APACHE: Failed configtest, reload NOT done");
return $self;
......@@ -694,7 +694,7 @@ sub _webserverReloadApache
$self->logger("INFO","APACHE: Successful configtest");
# Reload Apache config
system('service apache reload > /dev/null 2>&1');
system('/usr/sbin/service apache reload > /dev/null 2>&1');
if ($? >> 8) {
$self->logger("ERROR","APACHE: Failed reload");
return $self;
......@@ -717,7 +717,7 @@ sub _webserverReloadNginx
# Check if the configtest passes
if ($self->{'live'}) {
# Check if Nginx config is OK
system('service nginx configtest > /dev/null 2>&1');
system('/usr/sbin/service nginx configtest > /dev/null 2>&1');
if ($? >> 8) {
$self->logger("ERROR","NGINX: Failed configtest, reload NOT done");
return $self;
......@@ -726,7 +726,7 @@ sub _webserverReloadNginx
$self->logger("INFO","NGINX: Successful configtest");
# Reload Nginx config
system('service nginx reload > /dev/null 2>&1');
system('/usr/sbin/service nginx reload > /dev/null 2>&1');
if ($? >> 8) {
$self->logger("ERROR","NGINX: Failed reload");
return $self;
......@@ -1791,7 +1791,7 @@ use Getopt::Long;
my $NAME = "AWIT-CertMaster";
our $VERSION = "1.1.9";
our $VERSION = "1.1.10";
......
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