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

remove DB_* env vars

Browse Source
This commit is contained in:
Oliver Gorwits
2018-01-20 15:23:43 +00:00
parent 6a263c6ad0
commit e1e1955b99
1 changed files with 5 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -25,18 +25,16 @@ if (ref {} eq ref setting('database')) {
($ENV{NETDISCO_DB_NAME} || $ENV{NETDISCO_DBNAME} || setting('database')->{name}); ($ENV{NETDISCO_DB_NAME} || $ENV{NETDISCO_DBNAME} || setting('database')->{name});
setting('database')->{host} = setting('database')->{host} =
($ENV{NETDISCO_DB_HOST} || $ENV{DB_PORT_5432_TCP_ADDR} || setting('database')->{host}); ($ENV{NETDISCO_DB_HOST} || setting('database')->{host});
setting('database')->{host} .= setting('database')->{host} .= (';'. $ENV{NETDISCO_DB_PORT})
(';'. ($ENV{NETDISCO_DB_PORT} || $ENV{DB_PORT_5432_TCP_PORT})) if (setting('database')->{host} and $ENV{NETDISCO_DB_PORT});
if (setting('database')->{host} and
($ENV{NETDISCO_DB_PORT} || $ENV{DB_PORT_5432_TCP_PORT}));
setting('database')->{user} = setting('database')->{user} =
($ENV{NETDISCO_DB_USER} || $ENV{DB_ENV_POSTGRES_USER} || setting('database')->{user}); ($ENV{NETDISCO_DB_USER} || setting('database')->{user});
setting('database')->{pass} = setting('database')->{pass} =
($ENV{NETDISCO_DB_PASS} || $ENV{DB_ENV_POSTGRES_PASSWORD} || setting('database')->{pass}); ($ENV{NETDISCO_DB_PASS} || setting('database')->{pass});
my $name = setting('database')->{name}; my $name = setting('database')->{name};
my $host = setting('database')->{host}; my $host = setting('database')->{host};