From e98bd0ec8dc3f72f86d283167a8b492f18aac170 Mon Sep 17 00:00:00 2001 From: Shay Bergmann Date: Thu, 22 Jul 2021 23:27:21 -0400 Subject: [PATCH] Comment around dupe to avoid drift --- src/lib/Hydra.pm | 5 +++++ src/lib/Hydra/Helper/Nix.pm | 5 +++++ 2 files changed, 10 insertions(+) diff --git a/src/lib/Hydra.pm b/src/lib/Hydra.pm index fc87392a..6ba1b663 100644 --- a/src/lib/Hydra.pm +++ b/src/lib/Hydra.pm @@ -51,6 +51,11 @@ __PACKAGE__->config( 'Plugin::ConfigLoader' => { driver => { '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, -IncludeAgain => 1 } diff --git a/src/lib/Hydra/Helper/Nix.pm b/src/lib/Hydra/Helper/Nix.pm index 51509c73..27b1b15a 100644 --- a/src/lib/Hydra/Helper/Nix.pm +++ b/src/lib/Hydra/Helper/Nix.pm @@ -42,6 +42,11 @@ sub getHydraConfig { return $hydraConfig if defined $hydraConfig; my $conf = $ENV{"HYDRA_CONFIG"} || (Hydra::Model::DB::getHydraPath . "/hydra.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 , -UseApacheInclude => 1 , -IncludeAgain => 1