- new options, more comments, real configs

Changed files:
    config/builder.conf -> 1.28

diff --git a/config/builder.conf b/config/builder.conf
index 9d73ccdfc784e87d340d61105de9b751799114e6..f119e049087f6b8f7d7627c9092dafd896159646 100644 (file)
--- a/config/builder.conf
+++ b/config/builder.conf
@@ -1,59 +1,74 @@
 [all]
-# builder email (in From:)
-email = builder@nowhere
-admin_email = bldadm@roke.freak
-# list of binary builders
-binary_builders = roke-athlon roke-i686
-# the only src builder
-src_builder = roke-src
-# logs always go to spool/log, if you want syslog in addition,
-# specify facility here (user or local0-7 is the best choice probably)
-# if you don't want syslog, leave it empty
+# Builder email (put in From: field when this builder is sending mails).
+email = builder-th@pld-linux.org
+
+# Admin's email (she gets mails about errors and such).
+admin_email = th-admin@pld-linux.org
+
+# List of binary builders. This thing must be present on both src and bin 
+# builders.
+binary_builders = th-athlon
+
+# Name of the src builder (this field is ignored on binary builders).
+src_builder = th-src
+
+# Logs always go to spool/log, if you want syslog in addition,
+# specify facility here (user or local0-7 is the best choice probably).
+# If you don't want syslog, leave it empty.
 syslog =
-# wrapper command for sudo chroot ...
+
+# Wrapper command for sudo chroot (used eg on sparc).
 #sudo_chroot_wrapper = sparc32
 sudo_chroot_wrapper =
-# to be placed in Cc: of status and error reports
+
+# To be placed in Cc: of status and error reports (a mailing list usually).
 builder_list =
 
-# keep rpms in /spools/ready for how long (in hours)
+# Keep rpms in /spools/ready inside chroots for how long (in hours).
 max_keep_time = 168
 
-# bot
+# CIA bot (see cia.navi.cx).
 #bot_email = cia@pld-linux.org
 
 # ------ Binary builders config:
-# how much jobs can be run at once
+# How much jobs can be run at once (how many concurent builds).
 job_slots = 1
-# maximal load, at which rpm processing can start
+
+# Maximal load, above which builds won't get started.
 max_load = 10.0
-# nice control
+
+# Nice control.
 #nice = 0
-# where to look for queue.gz and counter
-control_url = http://roke.freak/builder/
-# email where to send status notifications
-notify_email = srpms_builder@roke.freak
+
+# Where to look for queue.gz and counter (published through www by src builder).
+control_url = http://ep09.pld-linux.org/~builderth/
+
+# Src builder's email for sending status notifications (build ok/failed).
+notify_email = builder-th@pld-linux.org
 
 # ------ SRC builder config:
-# list of name-version-release tag prefixes
-#tag_prefixes = auto- auto-ac-
-tag_prefixes =
+# List of name-version-release tag prefixes.
+#tag_prefixes = auto- auto-ac- auto-th-
+tag_prefixes = auto-th-
 
-[roke-src]
-arch = athlon
-chroot = /adm/chroot-src
-buildlogs_url = rsync://bl@roke.freak/buildlogs/nest/SRPMS/.new/
-ftp_url = scp://ftpadm@roke.freak:incoming
+# ------ Configs for particular builders:
 
-[roke-athlon]
+[th-src]
+arch = i686
+chroot = /home/pld/builderth/chroots/chroot-src/
+buildlogs_url = rsync://blogs-th@buildlogs.pld-linux.org/pld-buildlogs-th-SRPMS/
+ftp_url = scp://pldth@ep09.pld-linux.org:ftp/.incoming/SRPMS/
+test_ftp_url = scp://pldth@ep09.pld-linux.org:ftp/.test-builds/SRPMS/
+rpmqa_url = scp://pldth@ep09.pld-linux.org:ftp/.stat/builder/th/
+rpmqa_filename = rpmqa-SRPMS.txt
+
+[th-athlon]
 arch = athlon
-chroot = /adm/chroot-athlon
-buildlogs_url = rsync://bl@roke.freak/buildlogs/nest/athlon/.new/
-ftp_url = scp://ftpadm@roke.freak:incoming
+chroot = /home/users/builderth/chroot-athlon/
+buildlogs_url = /dev/null
+ftp_url = scp://pldth@ep09.pld-linux.org:ftp/.incoming/athlon/
+test_ftp_url = /dev/null
+rpmqa_url = /dev/null
+rpmqa_filename = nothing
 
-[roke-i686]
-arch = i686
-chroot = /adm/chroot-i686
-buildlogs_url = rsync://bl@roke.freak/buildlogs/nest/i686/.new/
-ftp_url = scp://ftpadm@roke.freak:incoming