Tidy the config template

diff --git a/build-farm.conf.template b/build-farm.conf.template
index 268e27952090697e7537ed5cc3e525d099ce6305..1afd0fb2d05d0d6c61652742f97fd90d920daf91 100644 (file)
--- a/build-farm.conf.template
+++ b/build-farm.conf.template
@@ -11,24 +11,19 @@ See accompanying License file for license details
 
 package EximBuild;
 
 
 package EximBuild;
 

+use 5.010;

 use strict;
 use strict;

+use warnings;

 
 

-use vars qw(%conf);
-
-# use vars qw($VERSION); $VERSION = 'REL_0.1';
-
-my $branch;
-{
-    no warnings qw(once);
-    $branch = $main::branch;
-}
+my $branch = $::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';
+my $farm_user_name = getpwuid($<) // die "$0: can't get user name from uid $<: $!\n";

 
 

-%conf =(
+our %conf =(

     scm => 'git',
     # default is github mirror of Exim
     scm => 'git',
     # default is github mirror of Exim

+    # Only used for the initial clone (?)

     scmrepo => 'https://github.com/Exim/exim.git',
     # webref for diffs on server - use default for community
     scm_url => undef,
     scmrepo => 'https://github.com/Exim/exim.git',
     # webref for diffs on server - use default for community
     scm_url => undef,


@@ -46,9 +41,9 @@ my $farm_user_name = 'farm';
     tar_log_cmd => undef,
     # If running multiple animals, an explicit common directory for
     # the lockfile so that runs do not conflict. Otherwise, leave unset.
     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",
+    global_lock_dir => $ENV{HOME},

     # this directory must exist before anything will work
     # this directory must exist before anything will work

-    build_root => "/home/$farm_user_name/buildfarm",
+    build_root => "$ENV{HOME}/buildfarm",

     # set true to do vpath builds
     use_vpath => undef,
 
     # set true to do vpath builds
     use_vpath => undef,
 


@@ -57,10 +52,10 @@ my $farm_user_name = 'farm';
     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://buildfarm.exim.org/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://buildfarm.exim.org/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",
 
     # Your host alias and password in the BuildFarm
     animal => "alias_assigned_by_build_team",


@@ -120,7 +115,7 @@ my $farm_user_name = 'farm';
     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_user_name/buildfarm/ccache/$branch",
+        CCACHE_DIR => "$ENV{HOME}/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


@@ -146,7 +141,7 @@ my $farm_user_name = 'farm';
         #TLS_LIBS => '-lssl -lcrypto',
         #EXPERIMENTAL_SPF => 'yes',
         #LOOKUP_LDAP => 'yes',
         #TLS_LIBS => '-lssl -lcrypto',
         #EXPERIMENTAL_SPF => 'yes',
         #LOOKUP_LDAP => 'yes',

-        #LOOKUP_INCLUDE => '-I/usr/include/mysql',
+        #LOOKUP_INCLUDE => '-I/usr/include/mysql -I/usr/include/postgresql'

         #LOOKUP_LIBS => '-lmysqlclient -lpq -lldap -llber',
         #LDAP_LIB_TYPE => 'OPENLDAP2',
     },
         #LOOKUP_LIBS => '-lmysqlclient -lpq -lldap -llber',
         #LDAP_LIB_TYPE => 'OPENLDAP2',
     },