vriska/hydra
0
0
Fork 0
forked from lix-project/hydra
Code Pull requests Activity

Hackery

Browse source
This commit is contained in:
Eelco Dolstra 2015-07-02 02:55:15 +02:00
parent 377d9d37f3
commit 535e936732
1 changed files with 5 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
hydra-module.nix
View file

@ -25,6 +25,7 @@ let
serverEnv = env // serverEnv = env //
{ HYDRA_TRACKER = cfg.tracker; { HYDRA_TRACKER = cfg.tracker;
COLUMNS = "80"; COLUMNS = "80";
PGPASSFILE = "${baseDir}/pgpass-www"; # grrr
} // (optionalAttrs cfg.debugServer { DBIC_TRACE = 1; }); } // (optionalAttrs cfg.debugServer { DBIC_TRACE = 1; });
localDB = "dbi:Pg:dbname=hydra;user=hydra;"; localDB = "dbi:Pg:dbname=hydra;user=hydra;";
@ -165,6 +166,7 @@ in
{ description = "Hydra queue runner"; { description = "Hydra queue runner";
group = "hydra"; group = "hydra";
useDefaultShell = true; useDefaultShell = true;
home = "${baseDir}/queue-runner"; # really only to keep SSH happy
}; };
users.extraUsers.hydra-www = users.extraUsers.hydra-www =
@ -256,7 +258,9 @@ in
requires = [ "hydra-init.service" ]; requires = [ "hydra-init.service" ];
after = [ "hydra-init.service" "network.target" ]; after = [ "hydra-init.service" "network.target" ];
path = [ pkgs.nettools ]; path = [ pkgs.nettools ];
environment = env; environment = env // {
PGPASSFILE = "${baseDir}/pgpass-queue-runner"; # grrr
};
serviceConfig = serviceConfig =
{ ExecStartPre = "${cfg.package}/bin/hydra-queue-runner --unlock"; { ExecStartPre = "${cfg.package}/bin/hydra-queue-runner --unlock";
ExecStart = "@${cfg.package}/bin/hydra-queue-runner hydra-queue-runner"; ExecStart = "@${cfg.package}/bin/hydra-queue-runner hydra-queue-runner";