diff options
Diffstat (limited to 'lib/load-configuration')
| -rwxr-xr-x | lib/load-configuration | 23 |
1 files changed, 10 insertions, 13 deletions
diff --git a/lib/load-configuration b/lib/load-configuration index b12b0cd..4c825f1 100755 --- a/lib/load-configuration +++ b/lib/load-configuration @@ -4,14 +4,10 @@ # shellcheck disable=SC2034 -# TODO: If there are intentions left which noone executes, we should try -# to reexecute them or at least warn the caller. Else, we might wait -# indefinitely. - set -e export LANG=C -if [ "$(hostname)" = 'buildmaster.archlinux32.org' ]; then +if [ "$(uname -n)" = 'buildmaster.archlinux32.org' ]; then i_am_the_master=true # abort early if mysqld is not running or kill switch active @@ -42,7 +38,7 @@ else fi # dirty hack to get this stuff debugable from a bash -if [ "x${0##*/}" = "x-bash" ] || [ "x${0##*/}" = "xbash" ] || [ "x${0##*/}" = "xdash" ]; then +if [ "${0##*/}" = "-bash" ] || [ "${0##*/}" = "bash" ] || [ "${0##*/}" = "dash" ]; then set +e if [ -z "${base_dir}" ]; then base_dir=$(pwd) @@ -118,7 +114,7 @@ webserver_directory='/srv/http' build_log_directory='/srv/http/build-logs' # irc client configuration -irc_dir='/home/master/irc/irc.freenode.net' +irc_dir='/home/master/irc/irc.libera.chat' irc_password='top_secret' # commands to run to update the package mirror used for installing archlinux32 packages, @@ -139,6 +135,12 @@ max_testing_duration="14" # set default location of archbuild chroots archbuild_chroots='/var/lib/archbuild' +# load static values from the database +if ${i_am_the_master} \ +|| [ "${0##*/}" = 'nit-picker' ]; then + mysql_retrieve_static_information +fi + # possibly pull in custom modifications if [ -r "${base_dir}/conf/common.conf" ]; then @@ -158,11 +160,6 @@ if ! ${i_am_the_master} && \ . "${base_dir}/conf/slave.conf" fi -# load static values from the database -if ${i_am_the_master}; then - mysql_retrieve_static_information -fi - # check / set up environment if [ -z "${build_list_lock_file}" ]; then @@ -216,7 +213,7 @@ for repo in ${repo_names} 'releng'; do repo_source='git@git.archlinux32.org:archlinux32/releng.git' ;; *) - repo_source="git://git.archlinux.org/svntogit/${repo}.git" + repo_source="https://github.com/archlinux/svntogit-${repo}.git" ;; esac git clone --mirror "${repo_source}" "${repo_path}" |