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

Merge branch '945-set-a-default-servername-value-in-pandora_db-dev' into 'develop' 

Set servername default value in pandora_db script

See merge request !539
This commit is contained in:
vgilc 2017-06-14 10:49:48 +02:00
parent 9b35a7f5ba c0036d523c
commit 773c6e3bc7
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
pandora_server/util/pandora_db.pl
View File

@ -675,9 +675,13 @@ sub pandora_load_config ($) {
$conf->{"dynamic_warning"} = 0.10 unless defined($conf->{"dynamic_warning"});
$conf->{"dynamic_updates"} = 5 unless defined($conf->{"dynamic_updates"});
$conf->{'servername'} = $conf->{'servername'};
$conf->{'servername'} = `hostname` unless defined ($conf->{'servername'});
$conf->{"servername"} =~ s/\s//g;
# workaround for name unconsistency (corresponding entry at pandora_server.conf is 'errorlog_file')
$conf->{'errorlogfile'} = $conf->{'errorlog_file'};
$conf->{'errorlogfile'} = "/var/log/pandora_server.error" unless defined ($conf->{'errorlogfile'});
$conf->{'errorlogfile'} = $conf->{'errorlog_file'};
$conf->{'errorlogfile'} = "/var/log/pandora_server.error" unless defined ($conf->{'errorlogfile'});
# Read additional tokens from the DB
my $dbh = db_connect ($conf->{'dbengine'}, $conf->{'dbname'}, $conf->{'dbhost'}, $conf->{'dbport'}, $conf->{'dbuser'}, $conf->{'dbpass'});