Factor out common options

[?]
Jul 26, 2021, 3:43 AM
5DZAUSUVVAEKBPRXYEDPBLNG55ZSUZQARGDYG2442T7DPOQKNECQC

Dependencies

  • [2] OESYNPBA Fix tests
  • [3] MEPE3HCU getHydraConfig: Allow multiple includes
  • [4] UCCNGBKL Comment around dupe to avoid drift
  • [5] KKHVM4KA Move GC roots to /nix/var/nix/gcroots/hydra
  • [6] NNJZNDVU Plugin::Authentication config: modernize
  • [7] J7GLZHA3 Make hydra-server honor config file includes
  • [8] SGLGUD7R Enable apache style includes in the config file
  • [9] 2SP37OH2 Send ETag and Expires headers
  • [*] D5QIOJGP * Move everything up one directory.
  • [*] 2GK5DOU7 * Downloading closures.
  • [*] T7Z63K6T hydra: moves jobsetOverview sub
  • [*] J5UVLXOK * Start of a basic Catalyst web interface.
  • [*] LKDWWJLM Doh

Change contents

  • file addition: Config.pm (----------)
    [11.53]
    package Hydra::Config;
    use strict;
    use Exporter;
    our @ISA = qw(Exporter);
    our @EXPORT = qw(%configGeneralOpts);
    my %configGeneralOpts = (-UseApacheInclude => 1, -IncludeAgain => 1);
    1;
  • edit in src/lib/Hydra/Helper/Nix.pm at line 8
    [2.21]
    [13.0]
    use Hydra::Config;
  • replacement in src/lib/Hydra/Helper/Nix.pm at line 52
    [5.58][5.58:118](),[5.118][3.0:56](),[3.56][5.118:164](),[5.118][5.118:164]()
    , -UseApacheInclude => 1
    , -IncludeAgain => 1
    )->getall;
    [5.58]
    [5.164]
    , %configGeneralOpts )->getall;
  • edit in src/lib/Hydra.pm at line 9
    [15.22]
    [14.7006]
    use Hydra::Config;
  • replacement in src/lib/Hydra.pm at line 54
    [5.59][5.59:86](),[5.86][4.268:605](),[4.605][5.86:175](),[5.86][5.86:175]()
    '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
    }
    [5.59]
    [5.175]
    'General' => \%configGeneralOpts