Send patches - preferably formatted by git format-patch - to patches at archlinux32 dot org.
summaryrefslogtreecommitdiff
path: root/conf
diff options
context:
space:
mode:
Diffstat (limited to 'conf')
-rwxr-xr-xconf/master.conf.example6
-rwxr-xr-xconf/slave.conf.example11
2 files changed, 9 insertions, 8 deletions
diff --git a/conf/master.conf.example b/conf/master.conf.example
index 2234dfd..5cf9c90 100755
--- a/conf/master.conf.example
+++ b/conf/master.conf.example
@@ -3,7 +3,7 @@
# configurable variables used on the build master
# default values are given as comments
-# To change variables from their default, copy this file to common.conf,
+# To change variables from their default, copy this file to master.conf,
# uncomment and change the desired variables.
#repo_key='0xdeadbeef'
@@ -36,10 +36,12 @@
#mirror_refresh_trigger_urls=''
# command to access the mysql database
-#mysql_command='mysql buildmaster'
+#mysql_command='mariadb buildmaster'
#build_list_lock_file="${work_dir}/build-list.lock"
+#check_mirrors_lock_file="${work_dir}/check-mirrors.lock"
#harvest_commit_times_lock_file="${work_dir}/harvest-commit-times.lock"
+#intentions_lock_file="${work_dir}/intentions.lock"
#package_database_lock_file="${work_dir}/package-database.lock"
#sanity_check_lock_file="${work_dir}/sanity-check.lock"
#status_lock_file="${work_dir}/status.lock"
diff --git a/conf/slave.conf.example b/conf/slave.conf.example
index 3704e23..ef742a9 100755
--- a/conf/slave.conf.example
+++ b/conf/slave.conf.example
@@ -3,7 +3,7 @@
# configurable variables used on the build slaves
# default values are given as comments
-# To change variables from their default, copy this file to common.conf,
+# To change variables from their default, copy this file to slave.conf,
# uncomment and change the desired variables.
#master_build_server="buildmaster.archlinux32.org"
@@ -13,9 +13,7 @@
#package_key='0x15eebadc0de'
-#repo_names='packages community archlinux32'
-#repo_paths__packages="${work_dir}/repos/packages"
-#repo_paths__community="${work_dir}/repos/community"
+#repo_names='archlinux32'
#repo_paths__archlinux32="${work_dir}/repos/packages32"
# mirror of sources, identified (solely) by hash
@@ -24,10 +22,11 @@
# what should be tried in what order to somehow repair a broken build
#straws_that_might_repair_failing_builds=$(
# printf '%s\n' \
-# ':mirrored_source:mirrored_source_by_hash:' \
+# ':mirrored_source_by_hash:' \
# ':clean_chroot:haskell_without_check:' \
# ':with_build_support:' \
-# ':with_build_support:clean_chroot:'
+# ':with_build_support:clean_chroot:' \
+# ':with_build_support:haskell_without_check:'
#)
# commands to run to update the i686 package mirror used for installing i686 packages,