From a71e6301d222e265d755337576667e1b6c24a56c Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <edolstra@gmail.com>
Date: Tue, 31 Jul 2018 21:41:17 +0200
Subject: [PATCH] Fix Hydra VM tests
---
hydra-module.nix | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/hydra-module.nix b/hydra-module.nix
index 980c1cb7..ce5dc266 100644
--- a/hydra-module.nix
+++ b/hydra-module.nix
@@ -252,6 +252,7 @@ in
requires = optional haveLocalDB "postgresql.service";
after = optional haveLocalDB "postgresql.service";
environment = env;
+ path = [ pkgs.utillinux ];
preStart = ''
mkdir -p ${baseDir}
chown hydra.hydra ${baseDir}
@@ -268,8 +269,8 @@ in
${optionalString haveLocalDB ''
if ! [ -e ${baseDir}/.db-created ]; then
- ${config.services.postgresql.package}/bin/createuser hydra
- ${config.services.postgresql.package}/bin/createdb -O hydra hydra
+ runuser -u ${config.services.postgresql.superUser} -- ${config.services.postgresql.package}/bin/createuser hydra
+ runuser -u ${config.services.postgresql.superUser} -- ${config.services.postgresql.package}/bin/createdb -O hydra hydra
touch ${baseDir}/.db-created
fi
''}