Apply requested changes to Config.pm

Dependencies

• [2] 5DZAUSUV Factor out common options
• [3] J7GLZHA3 Make hydra-server honor config file includes
• [4] NILMMFMY Respect X-Request-Base header coming from a frontend proxy.
• [5] JAH3UPWA Support revision control systems via plugins
• [6] LKDWWJLM Doh
• [7] KKHVM4KA Move GC roots to /nix/var/nix/gcroots/hydra
• [8] J5UVLXOK * Start of a basic Catalyst web interface.
• [9] UCCNGBKL Comment around dupe to avoid drift
• [10] TJK27WSB Open the DB using Hydra::Model::DB->new
• [11] NNJZNDVU Plugin::Authentication config: modernize
• [12] SGLGUD7R Enable apache style includes in the config file
• [13] U2ZK6LZ7 Fix some warnings
• [*] 2GK5DOU7 * Downloading closures.

Change contents

• edit in src/lib/Hydra/Config.pm at line 2
  [2.25]→[2.25:116](∅→∅)
  −

  − use strict;

  − use Exporter;

  −

  − our @ISA = qw(Exporter);

  − our @EXPORT = qw(%configGeneralOpts);
• replacement in src/lib/Hydra/Config.pm at line 3
  [2.117]→[2.117:187](∅→∅)
  − my %configGeneralOpts = (-UseApacheInclude => 1, -IncludeAgain => 1);
  [2.117]

  [2.187]
  + our %configGeneralOpts = (-UseApacheInclude => 1, -IncludeAgain => 1, -IncludeRelative => 1);
• edit in src/lib/Hydra/Helper/Nix.pm at line 45
  [3.227]

  [3.1044]
  + my %opts = (%Hydra::Config::configGeneralOpts, -ConfigFile => $conf);
• replacement in src/lib/Hydra/Helper/Nix.pm at line 52
  [3.267]→[3.0:58](∅→∅),[3.1064]→[3.0:58](∅→∅),[3.58]→[2.246:313](∅→∅)
  − my %h = new Config::General( -ConfigFile => $conf

  − , %configGeneralOpts )->getall;
  [3.267]

  [3.164]
  + my %h = new Config::General(%opts)->getall;
• edit in src/lib/Hydra.pm at line 9
  [3.22]→[2.314:333](∅→∅)
  − use Hydra::Config;
• replacement in src/lib/Hydra.pm at line 53
  [3.59]→[2.334:379](∅→∅)
  − 'General' => \%configGeneralOpts
  [3.59]

  [3.175]
  + 'General' => \%Hydra::Config::configGeneralOpts