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

add NETDISCO_DOMAIN

Browse Source
This commit is contained in:
Oliver Gorwits
2018-01-19 09:09:48 +00:00
parent 880d5b6951
commit aef290e34c
1 changed files with 6 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -18,6 +18,8 @@ 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')) {
# override from env for docker
setting('database')->{name} = setting('database')->{name} =
($ENV{NETDISCO_DB_NAME} || $ENV{NETDISCO_DBNAME} || setting('database')->{name}); ($ENV{NETDISCO_DB_NAME} || $ENV{NETDISCO_DBNAME} || setting('database')->{name});
@@ -111,6 +113,10 @@ setting('dns')->{'ETCHOSTS'} = {};
for keys %AnyEvent::DNS::EtcHosts::HOSTS; for keys %AnyEvent::DNS::EtcHosts::HOSTS;
} }
# override from env for docker
config->{'domain_suffix'} =
($ENV{NETDISCO_DOMAIN} || config->{'domain_suffix'});
# support unordered dictionary as if it were a single item list # support unordered dictionary as if it were a single item list
if (ref {} eq ref setting('device_identity')) { if (ref {} eq ref setting('device_identity')) {
config->{'device_identity'} = [ setting('device_identity') ]; config->{'device_identity'} = [ setting('device_identity') ];