hydra-module.nix: Cleanup

[?]
Mar 22, 2013, 4:16 PM
KMPLMG7TDEVQVZGRXQKG66G6P7LUDELSKRFUO557PQ4WZQI3SBAQC

Dependencies

  • [2] ZYEFL36Q Ported/merged properties from the TUD configuration's hydra-module
  • [3] CTYUTPED hydra-module: Remove `nix.*' settings.
  • [4] 3PNG7NIB Remove trailing whitespace
  • [5] ZVGQP2SX hydra-module: Add a `logo' option.
  • [6] D3MDJONY
  • [7] 3FTM52B2 hydra-module: Always GC to have at least 100 GiB available.

Change contents

  • edit in hydra-module.nix at line 7
    [3.77]
    [3.77]
    baseDir = "/var/lib/hydra";
  • replacement in hydra-module.nix at line 21
    [2.64][2.64:161]()
    HYDRA_CONFIG = "${cfg.baseDir}/data/hydra.conf";
    HYDRA_DATA = "${cfg.baseDir}/data";
    [2.64]
    [2.161]
    HYDRA_CONFIG = "${baseDir}/data/hydra.conf";
    HYDRA_DATA = "${baseDir}/data";
  • edit in hydra-module.nix at line 42
    [3.690][3.690:1031]()
    '';
    };
    baseDir = mkOption {
    default = "/home/${user.default}";
    description = ''
    The directory holding configuration, logs and temporary files.
    '';
    };
    user = mkOption {
    default = "hydra";
    description = ''
    The user the Hydra services should run as.
  • replacement in hydra-module.nix at line 46
    [3.1082][3.1082:1149]()
    default = "dbi:Pg:dbname=hydra;host=localhost;user=root;";
    [3.1082]
    [3.95]
    default = "dbi:Pg:dbname=hydra;host=localhost;user=hydra;";
  • edit in hydra-module.nix at line 61
    [3.1421][3.1421:1465]()
    default = "http://hydra.nixos.org";
  • edit in hydra-module.nix at line 88
    [3.2044][3.2044:2086]()
    default = "e.dolstra@tudelft.nl";
  • edit in hydra-module.nix at line 107
    [3.393][3.2354:2504](),[3.2354][3.2354:2504](),[3.2504][3.707:716](),[3.716][2.435:442]()
    autoStart = mkOption {
    default = true;
    description = ''
    If hydra upstart jobs should start automatically.
    '';
    };
  • replacement in hydra-module.nix at line 124
    [3.2641][3.2641:2722]()
    users.extraUsers = [
    { name = cfg.user;
    description = "Hydra";
    [3.2641]
    [3.2722]
    users.extraUsers.hydra =
    { description = "Hydra";
  • edit in hydra-module.nix at line 131
    [3.2952][3.2952:2953](),[3.2953][3.0:87]()
    # We have our own crontab entries for GC, see below.
    nix.gc.automatic = false;
  • replacement in hydra-module.nix at line 155
    [2.927][3.3739:3826](),[3.3739][3.3739:3826]()
    mkdir -p ${cfg.baseDir}/data
    chown ${cfg.user} ${cfg.baseDir}/data
    [2.927]
    [3.3826]
    mkdir -p ${baseDir}/data
    chown hydra ${cfg.baseDir}/data
  • replacement in hydra-module.nix at line 169
    [2.1324][2.1324:1353]()
    User = cfg.user;
    [2.1324]
    [2.1353]
    User = "hydra";
  • replacement in hydra-module.nix at line 183
    [2.1842][2.1842:1871]()
    User = cfg.user;
    [2.1842]
    [2.1871]
    User = "hydra";
  • replacement in hydra-module.nix at line 196
    [2.2276][2.2276:2305]()
    User = cfg.user;
    [2.2276]
    [2.2305]
    User = "hydra";
  • replacement in hydra-module.nix at line 207
    [2.2622][2.2622:2651]()
    User = cfg.user;
    [2.2622]
    [2.2651]
    User = "hydra";
  • replacement in hydra-module.nix at line 217
    [3.299][3.299:322]()
    #! /bin/sh
    [3.299]
    [3.322]
    #! ${pkgs.stdenv.shell}
  • replacement in hydra-module.nix at line 227
    [3.1346][3.1346:1372]()
    #! /bin/sh -e
    [3.1346]
    [3.1372]
    #! ${pkgs.stdenv.shell} -e