Set umask only if not 022 already, print a notice about doing thata

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

diff --git a/build-farm.conf.template b/build-farm.conf.template
index 30134a708001bc3c859f2bc8ddcf2af90211ea14..268e27952090697e7537ed5cc3e525d099ce6305 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"
 }
 
 # 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
 %conf =(
     scm => 'git',
     # default is github mirror of Exim


@@ -42,8 +44,11 @@ my $branch;
     # replacement must have the same effect
     # must be absolute, can be either Unix or Windows style for MSVC
     tar_log_cmd => undef,
     # replacement must have the same effect
     # must be absolute, can be either Unix or Windows style for MSVC
     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_user_name",

     # this directory must exist before anything will work
     # 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,
 
     # set true to do vpath builds
     use_vpath => undef,
 


@@ -52,15 +57,22 @@ my $branch;
     core_file_glob => "core*",
 
     # build process will connect to this URL to upload results
     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)
     # 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",
     secret => "secret_assigned_by_build_team",
 
 
     # Your host alias and password in the BuildFarm
     animal => "alias_assigned_by_build_team",
     secret => "secret_assigned_by_build_team",
 

+    # allow automatic updates of the buildfarm client code.
+    # Leave it *unset* to get the default behaviour, set it
+    # to some false value to disable automatic updates or set it
+    # to the name of the remote Git repo you follow for your
+    # buildfarm-client code.
+    #auto_update => 'origin',
+

     # if force_every is a scalar it will be used on all branches, like this
     # for legacy reasons:
     # force_every => 336 , # max hours between builds, undef or 0 = unforced
     # if force_every is a scalar it will be used on all branches, like this
     # for legacy reasons:
     # force_every => 336 , # max hours between builds, undef or 0 = unforced


@@ -108,7 +120,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.
     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
 
         ### set this if you need a proxy setting for the
         # outbound web transaction that reports the results