From 535e93673247b3fef4374b0ff6ecaa38600b3c00 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Thu, 2 Jul 2015 02:55:15 +0200 Subject: [PATCH] Hackery --- hydra-module.nix | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/hydra-module.nix b/hydra-module.nix index a3b3c10e..9876ca70 100644 --- a/hydra-module.nix +++ b/hydra-module.nix @@ -25,6 +25,7 @@ let serverEnv = env // { HYDRA_TRACKER = cfg.tracker; COLUMNS = "80"; + PGPASSFILE = "${baseDir}/pgpass-www"; # grrr } // (optionalAttrs cfg.debugServer { DBIC_TRACE = 1; }); localDB = "dbi:Pg:dbname=hydra;user=hydra;"; @@ -165,6 +166,7 @@ in { description = "Hydra queue runner"; group = "hydra"; useDefaultShell = true; + home = "${baseDir}/queue-runner"; # really only to keep SSH happy }; users.extraUsers.hydra-www = @@ -256,7 +258,9 @@ in requires = [ "hydra-init.service" ]; after = [ "hydra-init.service" "network.target" ]; path = [ pkgs.nettools ]; - environment = env; + environment = env // { + PGPASSFILE = "${baseDir}/pgpass-queue-runner"; # grrr + }; serviceConfig = { ExecStartPre = "${cfg.package}/bin/hydra-queue-runner --unlock"; ExecStart = "@${cfg.package}/bin/hydra-queue-runner hydra-queue-runner";