tyler.durden
/
pandorafms
mirror of https://github.com/pandorafms/pandorafms.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'pandora_enterprise/#3135-no-funciona-encriptacion-del-pandora_encrypt_db' into 'develop' 

Add a missing module to the Docker image and fix a related warning.

See merge request artica/pandorafms!2039
This commit is contained in:
vgilc 2018-12-04 13:05:58 +01:00
parent daa928adb4 e009ea5567
commit dfad4cf74f
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pandora_server/lib/PandoraFMS/Tools.pm
View File

@ -595,7 +595,7 @@ sub logger ($$;$) {
open (FILE, ">> $file") or die "[FATAL] Could not open logfile '$file'"; open (FILE, ">> $file") or die "[FATAL] Could not open logfile '$file'";
# Get an exclusive lock on the file (LOCK_EX) # Get an exclusive lock on the file (LOCK_EX)
flock (FILE, 2); flock (FILE, 2);
print FILE strftime ("%Y-%m-%d %H:%M:%S", localtime()) . " " . $pa_config->{'servername'} . " [V". $level ."] " . $message . "\n"; print FILE strftime ("%Y-%m-%d %H:%M:%S", localtime()) . " " . (defined($pa_config->{'servername'}) ? $pa_config->{'servername'} : '') . " [V". $level ."] " . $message . "\n";
close (FILE); close (FILE);
} }
} }

2
tests/enterprise_base/Dockerfile
View File

@ -2,7 +2,7 @@ FROM pandorafms/pandorafms-base
MAINTAINER Pandora FMS Team <info@pandorafms.com> MAINTAINER Pandora FMS Team <info@pandorafms.com>
# Pandora FMS Server dependencies # Pandora FMS Server dependencies
RUN yum install -y fping perl-Test-WWW-Selenium perl-Crypt-Blowfish perl-Crypt-ECB perl-Net-OpenSSH RUN yum install -y fping perl-Test-WWW-Selenium perl-Crypt-Blowfish perl-Crypt-ECB perl-Crypt-Rijndael perl-Net-OpenSSH
RUN ln -s /usr/bin/braa /usr/local/bin/braa RUN ln -s /usr/bin/braa /usr/local/bin/braa