NixOS/hydra
NixOS/hydra
1
0
Fork 0
mirror of https://github.com/NixOS/hydra.git synced 2024-10-18 17:02:28 -04:00
Code Activity

Comment around dupe to avoid drift

Browse source
This commit is contained in:
Shay Bergmann 2021-07-22 23:27:21 -04:00
parent 774194d681
commit e98bd0ec8d
No known key found for this signature in database
GPG key ID: 2ED50F33B46CC517
2 changed files with 10 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
src/lib/Hydra.pm
View file

@ -51,6 +51,11 @@ __PACKAGE__->config(
'Plugin::ConfigLoader' => { 'Plugin::ConfigLoader' => {
driver => { driver => {
'General' => { 'General' => {
# Please keep these options in sync with corresponding
# call to `new Config::General` in `getHydraConfig()` sub
# in `Hydra/Helper/Nix.pm`. This is necessary in order to
# maintain consistent interpretation of the config by the
# various hydra components.
-UseApacheInclude => 1, -UseApacheInclude => 1,
-IncludeAgain => 1 -IncludeAgain => 1
} }

5
src/lib/Hydra/Helper/Nix.pm
View file

@ -42,6 +42,11 @@ 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) {
# Please keep these options in sync with corresponding
# `Catalyst::Plugin::ConfigLoader` configuration in `Hydra.pm`
# This is necessary in order to maintain consistent interpretation
# of the config by the various hydra components.
my %h = new Config::General( -ConfigFile => $conf my %h = new Config::General( -ConfigFile => $conf
, -UseApacheInclude => 1 , -UseApacheInclude => 1
, -IncludeAgain => 1 , -IncludeAgain => 1