Support NETDISCO_DBNAME env var to override database name
This commit is contained in:
@@ -1,3 +1,13 @@
|
|||||||
|
2.031009 - 2015-02-25
|
||||||
|
|
||||||
|
[ENHANCEMENTS]
|
||||||
|
|
||||||
|
* Support NETDISCO_DBNAME env var to override database name
|
||||||
|
|
||||||
|
[BUG FIXES]
|
||||||
|
|
||||||
|
* Permit whitespace in usernames (for LDAP support)
|
||||||
|
|
||||||
2.031008 - 2015-02-22
|
2.031008 - 2015-02-22
|
||||||
|
|
||||||
[ENHANCEMENTS]
|
[ENHANCEMENTS]
|
||||||
|
|||||||
@@ -10,7 +10,7 @@ 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 = (setting('database')->{name} || 'netdisco');
|
my $name = ($ENV{NETDISCO_DBNAME} || setting('database')->{name} || 'netdisco');
|
||||||
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};
|
||||||
|
|||||||
Reference in New Issue
Block a user