Remove the debug die at startup. :(

[buildfarm-client.git] / build-farm.conf.template

diff --git a/build-farm.conf.template b/build-farm.conf.template
index 66a475035ded09e0658535f4551d16709ebbc9cf..fdaa9296496592f210c4ec94e5dc59e54bb968a7 100644 (file)
--- a/build-farm.conf.template
+++ b/build-farm.conf.template
@@ -24,6 +24,8 @@ my $branch;
 }
 
 # This template assumes that the user running the buildfarm process is "farm"
+my $farm_user_name = 'farm';
+
 %conf =(
     scm => 'git',
     # default is github mirror of Exim
@@ -44,9 +46,9 @@ my $branch;
     tar_log_cmd => undef,
     # If running multiple animals, an explicit common directory for
     # the lockfile so that runs do not conflict. Otherwise, leave unset.
-    global_lock_dir => '/home/farm',
+    global_lock_dir => "/home/$farm_user_name",
     # this directory must exist before anything will work
-    build_root => '/home/farm/buildfarm',
+    build_root => "/home/$farm_user_name/buildfarm",
     # set true to do vpath builds
     use_vpath => undef,
 
@@ -55,10 +57,10 @@ my $branch;
     core_file_glob => "core*",
 
     # build process will connect to this URL to upload results
-    target => "http://eximbuild.mrball.net/cgi-bin/eximstatus.pl",
+    target => "http://buildfarm.exim.org/cgi-bin/eximstatus.pl",
     # update_personality uses this when you want to update your
     # machine's info (OS, version, compiler, version)
-    upgrade_target => "http://eximbuild.mrball.net/cgi-bin/upgrade.pl",
+    upgrade_target => "http://buildfarm.exim.org/cgi-bin/upgrade.pl",
 
     # Your host alias and password in the BuildFarm
     animal => "alias_assigned_by_build_team",
@@ -111,7 +113,7 @@ my $branch;
     build_env =>{
         # use a dedicated cache for the build farm. this should give us
         # very high hit rates and slightly faster cache searching.
-        CCACHE_DIR => "/home/farm/buildfarm/ccache/$branch",
+        CCACHE_DIR => "/home/$farm_user_name/buildfarm/ccache/$branch",
 
         ### set this if you need a proxy setting for the
         # outbound web transaction that reports the results