Fix Hydra VM tests

This commit is contained in:
Eelco Dolstra 2018-07-31 21:41:17 +02:00
parent 1a899890ac
commit a71e6301d2
No known key found for this signature in database
GPG key ID: 8170B4726D7198DE

View file

@ -252,6 +252,7 @@ in
requires = optional haveLocalDB "postgresql.service"; requires = optional haveLocalDB "postgresql.service";
after = optional haveLocalDB "postgresql.service"; after = optional haveLocalDB "postgresql.service";
environment = env; environment = env;
path = [ pkgs.utillinux ];
preStart = '' preStart = ''
mkdir -p ${baseDir} mkdir -p ${baseDir}
chown hydra.hydra ${baseDir} chown hydra.hydra ${baseDir}
@ -268,8 +269,8 @@ in
${optionalString haveLocalDB '' ${optionalString haveLocalDB ''
if ! [ -e ${baseDir}/.db-created ]; then if ! [ -e ${baseDir}/.db-created ]; then
${config.services.postgresql.package}/bin/createuser hydra runuser -u ${config.services.postgresql.superUser} -- ${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/createdb -O hydra hydra
touch ${baseDir}/.db-created touch ${baseDir}/.db-created
fi fi
''} ''}