hydra-module: Don't assume hydra is running on localhost.

In the long run we should add retry logic to hydra-init...
NixOS · May 29, 2015 · bc36c7d · bc36c7d
1 parent a91cbef
commit bc36c7d
Showing 1 changed file with 4 additions and 3 deletions.
diff --git a/hydra-module.nix b/hydra-module.nix
@@ -186,8 +186,6 @@ in
 
     systemd.services."hydra-init" =
       { wantedBy = [ "multi-user.target" ];
-        requires = [ "postgresql.service" ];
-        after = [ "postgresql.service" ];
         environment = env;
         preStart = ''
           mkdir -m 0700 -p ${baseDir}/data
@@ -206,7 +204,10 @@ in
         serviceConfig.User = "hydra";
         serviceConfig.Type = "oneshot";
         serviceConfig.RemainAfterExit = true;
-      };
+      } // (optionalAttrs (cfg.dbi == "dbi:Pg:dbname=hydra;user=hydra;") {
+        requires = [ "postgresql.service" ];
+        after = [ "postgresql.service" ];
+      });
 
     systemd.services."hydra-server" =
       { wantedBy = [ "multi-user.target" ];