Make alternate placement of standard directory layout simpler

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

diff --git a/build-farm.conf.template b/build-farm.conf.template
index c73863a3fe2b198d28aa701a409dff386f2c1e67..eb131523d62ddab3238889c74b87d20f20814469 100644 (file)
--- a/build-farm.conf.template
+++ b/build-farm.conf.template
@@ -17,6 +17,9 @@ use warnings;
 
 my $branch = $::branch;
 
 
 my $branch = $::branch;
 

+# This could be changed to use the startdard layout but in a different place
+my $basedir = $ENV{HOME};
+

 # This template assumes that the user running the buildfarm process is "farm"
 my $farm_user_name = getpwuid($<) // die "$0: can't get user name from uid $<: $!\n";
 
 # This template assumes that the user running the buildfarm process is "farm"
 my $farm_user_name = getpwuid($<) // die "$0: can't get user name from uid $<: $!\n";
 


@@ -41,25 +44,29 @@ our %conf =(
     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 => $ENV{HOME},
+    global_lock_dir => $basedir,

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

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

     # set true to do vpath builds
     use_vpath => undef,
 
     keep_error_builds => 0,
     # Linux style, use "*.core" for BSD
     # set true to do vpath builds
     use_vpath => undef,
 
     keep_error_builds => 0,
     # Linux style, use "*.core" for BSD

-    core_file_glob => "core*",
+    core_file_glob => 'core*',
+
+    # Note about HTTPS: HTTPS support is experimental. For a
+    # limited time you may try to use HTTP, in case HTTPS doesn't
+    # work for you.

 
     # build process will connect to this URL to upload results
 
     # build process will connect to this URL to upload results

-    target => 'http://buildfarm.exim.org/cgi-bin/eximstatus.pl',
+    target => 'https://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 => 'https://buildfarm.exim.org/cgi-bin/upgrade.pl',

 
     # Your host alias and password in the BuildFarm
 
     # Your host alias and password in the BuildFarm

-    animal => "alias_assigned_by_build_team",
-    secret => "secret_assigned_by_build_team",
+    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
 
     # allow automatic updates of the buildfarm client code.
     # Leave it *unset* to get the default behaviour, set it


@@ -115,7 +122,7 @@ our %conf =(
     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 => "$ENV{HOME}/buildfarm/ccache/$branch",
+        CCACHE_DIR => "$basedir/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


@@ -136,9 +143,13 @@ our %conf =(
         AUTH_PLAINTEXT => 'yes',
         SUPPORT_MAILDIR => 'yes',
         # Other examples. Could use makefile_regex instead.
         AUTH_PLAINTEXT => 'yes',
         SUPPORT_MAILDIR => 'yes',
         # Other examples. Could use makefile_regex instead.

+        #

         #SUPPORT_TLS => 'yes',
         #SUPPORT_TLS => 'yes',

-        #USE_OPENSSL_PC => 'openssl',
+        #  Enable the proper libs here or see in makefile_regex
+        #  for use of pkg-config
+        #USE_GNUTLS => 'yes'

         #TLS_LIBS => '-lssl -lcrypto',
         #TLS_LIBS => '-lssl -lcrypto',

+        #

         #LOOKUP_LDAP => 'yes',
         #LOOKUP_INCLUDE => '-I/usr/include/mysql -I/usr/include/postgresql'
         #LOOKUP_LIBS => '-lmysqlclient -lpq -lldap -llber',
         #LOOKUP_LDAP => 'yes',
         #LOOKUP_INCLUDE => '-I/usr/include/mysql -I/usr/include/postgresql'
         #LOOKUP_LIBS => '-lmysqlclient -lpq -lldap -llber',


@@ -168,9 +179,14 @@ our %conf =(
     makefile_regex =>[
         # If have perl devel libraries installed, can build embedded perl
         #q(s/^# EXIM_PERL=/EXIM_PERL=/),
     makefile_regex =>[
         # If have perl devel libraries installed, can build embedded perl
         #q(s/^# EXIM_PERL=/EXIM_PERL=/),

+        # Use SSL libraries
+        #q(s/^# (USE_GNUTLS(?:_PC)?=.*)/$1/),
+        #q(s/^# (USE_OPENSSL_PC=.*)/$1/),

         # Several experimental features to consider
         # Several experimental features to consider

-        #q(s/^# EXPERIMENTAL_CERTNAMES.*/EXPERIMENTAL_CERTNAMES=yes/),
-        #q(s/^# EXPERIMENTAL_DNSSEC.*/EXPERIMENTAL_DNSSEC=yes/),
+        # May be outdated, please check a current EDITME for
+        # for options.
+        #q(s/^# (EXPERIMENTAL_CERTNAMES.*)/$1/),
+        #q(s/^# (EXPERIMENTAL_DNSSEC.*)/$1/),

     ],
 
     # The user compiled as the master exim username.
     ],
 
     # The user compiled as the master exim username.


@@ -178,7 +194,7 @@ our %conf =(
     # the group of the exim user as a secondary group. Example:
     # user=>farm, group=>farm, secondary_groups=>exim
     # user=>exim, group=>exim
     # the group of the exim user as a secondary group. Example:
     # user=>farm, group=>farm, secondary_groups=>exim
     # user=>exim, group=>exim

-    master_exim_user => "exim",
+    master_exim_user => 'exim',

 
     # Range of tests to run if enable make_test in optional steps.
     # Start with just a couple while getting the aminal set up,
 
     # Range of tests to run if enable make_test in optional steps.
     # Start with just a couple while getting the aminal set up,