delroth/hydra
0
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Merge branch 'no-local-psql'

Browse source
This commit is contained in:
Shea Levy 2015-07-10 09:09:34 -04:00
parent ccf6e6062c bc36c7ddd0
commit fc16c53886
1 changed files with 4 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
hydra-module.nix
View file

@ -186,8 +186,6 @@ in
systemd.services."hydra-init" = systemd.services."hydra-init" =
{ wantedBy = [ "multi-user.target" ]; { wantedBy = [ "multi-user.target" ];
requires = [ "postgresql.service" ];
after = [ "postgresql.service" ];
environment = env; environment = env;
preStart = '' preStart = ''
mkdir -m 0700 -p ${baseDir}/data mkdir -m 0700 -p ${baseDir}/data
@ -206,7 +204,10 @@ in
serviceConfig.User = "hydra"; serviceConfig.User = "hydra";
serviceConfig.Type = "oneshot"; serviceConfig.Type = "oneshot";
serviceConfig.RemainAfterExit = true; serviceConfig.RemainAfterExit = true;
}; } // (optionalAttrs (cfg.dbi == "dbi:Pg:dbname=hydra;user=hydra;") {
requires = [ "postgresql.service" ];
after = [ "postgresql.service" ];
});
systemd.services."hydra-server" = systemd.services."hydra-server" =
{ wantedBy = [ "multi-user.target" ]; { wantedBy = [ "multi-user.target" ];