diff --git a/roles/koji_builder/files/stg-kojid.conf b/roles/koji_builder/files/stg-kojid.conf new file mode 100644 index 0000000000..8ad38e58ba --- /dev/null +++ b/roles/koji_builder/files/stg-kojid.conf @@ -0,0 +1,62 @@ +[kojid] +; The number of seconds to sleep between tasks +; sleeptime=15 + +; The maximum number of jobs that kojid will handle at a time +; maxjobs=10 + +; The minimum amount of free space (in MBs) required for each build root +; minspace=8192 + +; The directory root where work data can be found from the koji hub +; topdir=/mnt/koji + +;url of package download site +topurl = http://kojipkgs.stg.fedoraproject.org/ + +; The directory root for temporary storage +; workdir=/tmp/koji + +; The directory root for mock +; mockdir=/var/lib/mock + +; The user to run as when doing builds +; mockuser=kojibuilder + +; The vendor to use in rpm headers +vendor=Fedora Project + +; The packager to use in rpm headers +packager=Fedora Project + +; the distribution to use in rpm headers +distribution=Fedora Project + +; The _host string to use in mock +mockhost=redhat-linux-gnu + +; The URL for the xmlrpc server +server=http://koji.stg.fedoraproject.org/kojihub + +; The URL for the packages tree +pkgurl=http://kojipkgs.stg.fedoraproject.org/packages + +; A space-separated list of hostname:repository pairs that kojid is authorized to checkout from (no quotes) +allowed_scms=pkgs.fedoraproject.org:/*:false:fedpkg,sources git.fedorahosted.org:/git/spin-kickstarts.git:false + +; The mail host to use for sending email notifications +smtphost=bastion.phx2.fedoraproject.org + +; The From address used when sending email notifications +from_addr=Fedora Koji Build System + +;configuration for SSL athentication + +;client certificate - puppet generated +cert = /etc/kojid/kojibuilder.pem + +;certificate of the CA that issued the client certificate +ca = /etc/kojid/cacert.pem + +;certificate of the CA that issued the HTTP server certificate +serverca = /etc/kojid/cacert.pem diff --git a/roles/koji_builder/tasks/main.yml b/roles/koji_builder/tasks/main.yml index 18f1fdc1f9..90f0a0ec48 100644 --- a/roles/koji_builder/tasks/main.yml +++ b/roles/koji_builder/tasks/main.yml @@ -68,7 +68,7 @@ - name: /etc/kojid/kojid.conf copy: src=kojid.conf dest=/etc/kojid/kojid.conf - when: not inventory_hostname.startswith(('arm01','arm03')) + when: not inventory_hostname.startswith(('arm01','arm03','koji01.stg','buildvm-01.stg')) notify: - restart kojid @@ -78,6 +78,12 @@ notify: - restart kojid +- name: staging /etc/kojid/kojid.conf + copy: src=stg-kojid.conf dest=/etc/kojid/kojid.conf + when: inventory_hostname.startswith(('koji01.stg','buildvm-01.stg')) + notify: + - restart kojid + - name: /etc/koji/koji.conf copy: src=koji.conf dest=/etc/koji.conf when: not inventory_hostname.startswith(('arm01','arm03'))