ahuston-0/hydra
1
0
Fork 0
Code Issues Pull Requests 1 Packages Projects Releases Wiki Activity

use HYDRA_DATA/hydra.conf as default location for hydra.conf

Browse Source
This commit is contained in:
Rob Vermaas
2011-03-07 15:06:32 +00:00
parent d4e9f5383b
commit 586f131ebd
3 changed files with 10 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/lib/Hydra/Helper/Nix.pm
View File

@ -10,7 +10,7 @@ use Hydra::Helper::CatalystUtils;
our @ISA = qw(Exporter);
our @EXPORT = qw(
isValidPath
getHydraPath getHydraDBPath openHydraDB txn_do
getHydraPath getHydraDBPath openHydraDB getHydraConf txn_do
registerRoot getGCRootsDir gcRootFor
getPrimaryBuildsForView
getPrimaryBuildTotal
@ -25,10 +25,16 @@ sub isValidPath {
sub getHydraPath {
my $dir = $ENV{"HYDRA_DATA"} || "/var/lib/hydra";
die "The HYDRA_DATA directory does not exist!\n" unless -d $dir;
die "The HYDRA_DATA directory ($dir) does not exist!\n" unless -d $dir;
return $dir;
}
sub getHydraConf {
my $conf = $ENV{"HYDRA_CONF"} || (getHydraPath . "/hydra.conf");
die "The HYDRA_CONF file ($conf) does not exist!\n" unless -f $conf;
return $conf;
}
sub getHydraDBPath {
my $db = $ENV{"HYDRA_DBI"};