Merge pull request #338 from expipiplus1/apache-include

Enable apache style includes in the config file
This commit is contained in:
Eelco Dolstra 2016-08-19 13:32:44 +02:00 committed by GitHub
commit b03e3c593c

View file

@ -38,7 +38,10 @@ sub getHydraConfig {
return $hydraConfig if defined $hydraConfig; return $hydraConfig if defined $hydraConfig;
my $conf = $ENV{"HYDRA_CONFIG"} || (Hydra::Model::DB::getHydraPath . "/hydra.conf"); my $conf = $ENV{"HYDRA_CONFIG"} || (Hydra::Model::DB::getHydraPath . "/hydra.conf");
if (-f $conf) { if (-f $conf) {
my %h = new Config::General($conf)->getall; my %h = new Config::General( -ConfigFile => $conf
, -UseApacheInclude => 1
)->getall;
$hydraConfig = \%h; $hydraConfig = \%h;
} else { } else {
$hydraConfig = {}; $hydraConfig = {};