135/netdisco
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

add NETDISCO_DB_*

Browse Source
This commit is contained in:
Oliver Gorwits
2018-01-19 01:17:11 +00:00
parent 0455df46fd
commit 880d5b6951
2 changed files with 19 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
lib/App/Netdisco/Configuration.pm
View File

@@ -18,7 +18,24 @@ BEGIN {
# set up database schema config from simple config vars # set up database schema config from simple config vars
if (ref {} eq ref setting('database')) { if (ref {} eq ref setting('database')) {
my $name = ($ENV{NETDISCO_DBNAME} || setting('database')->{name} || 'netdisco'); setting('database')->{name} =
($ENV{NETDISCO_DB_NAME} || $ENV{NETDISCO_DBNAME} || setting('database')->{name});
setting('database')->{host} =
($ENV{NETDISCO_DB_HOST} || $ENV{DB_PORT_5432_TCP_ADDR} || setting('database')->{host});
setting('database')->{host} .=
(';'. ($ENV{NETDISCO_DB_PORT} || $ENV{DB_PORT_5432_TCP_PORT}))
if (setting('database')->{host} and
($ENV{NETDISCO_DB_PORT} || $ENV{DB_PORT_5432_TCP_PORT}));
setting('database')->{user} =
($ENV{NETDISCO_DB_USER} || $ENV{DB_ENV_POSTGRES_USER} || setting('database')->{user});
setting('database')->{pass} =
($ENV{NETDISCO_DB_PASS} || $ENV{DB_ENV_POSTGRES_PASSWORD} || setting('database')->{pass});
my $name = setting('database')->{name};
my $host = setting('database')->{host}; my $host = setting('database')->{host};
my $user = setting('database')->{user}; my $user = setting('database')->{user};
my $pass = setting('database')->{pass}; my $pass = setting('database')->{pass};

2
lib/App/Netdisco/Worker/Plugin/Psql.pm
View File

@@ -8,7 +8,7 @@ register_worker({ phase => 'main' }, sub {
my ($job, $workerconf) = @_; my ($job, $workerconf) = @_;
my ($device, $port, $extra) = map {$job->$_} qw/device port extra/; my ($device, $port, $extra) = map {$job->$_} qw/device port extra/;
my $name = ($ENV{NETDISCO_DBNAME} || setting('database')->{name} || 'netdisco'); my $name = setting('database')->{name};
my $host = setting('database')->{host}; my $host = setting('database')->{host};
my $user = setting('database')->{user}; my $user = setting('database')->{user};
my $pass = setting('database')->{pass}; my $pass = setting('database')->{pass};