From d9fa9cd1135fbe5f6104324ce646f9b0491175af Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Wed, 13 Nov 2013 23:18:53 +0000 Subject: [PATCH] make sure the masher cert and koji cacerts are available on compose boxes make sure koji.conf uses the certs --- files/kojibuilder/koji.conf | 6 +++--- tasks/koji/releng_config.yml | 5 +++++ 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/files/kojibuilder/koji.conf b/files/kojibuilder/koji.conf index 6a152035ce..47f833d7d8 100644 --- a/files/kojibuilder/koji.conf +++ b/files/kojibuilder/koji.conf @@ -14,10 +14,10 @@ weburl = http://koji.fedoraproject.org/koji ;configuration for SSL athentication ;client certificate -;cert = ~/.koji/client.crt +cert = ~/.fedora.cert ;certificate of the CA that issued the client certificate -;ca = ~/.koji/clientca.crt +ca = ~/.fedora-server-ca.cert ;certificate of the CA that issued the HTTP server certificate -;serverca = ~/.koji/serverca.crt +serverca = ~/.fedora-server-ca.cert diff --git a/tasks/koji/releng_config.yml b/tasks/koji/releng_config.yml index f458a6d595..58968ff1b1 100644 --- a/tasks/koji/releng_config.yml +++ b/tasks/koji/releng_config.yml @@ -36,6 +36,11 @@ - name: add masher ssh priv key action: copy src=$private/files/mash/masher.id_rsa dest=/home/masher/.ssh/id_rsa mode=600 owner=masher group=masher +- name: add masher koji cert/key + action: copy src=$private/files/mash/masher.pem dest=/home/masher/.fedora.cert mode=600 owner=masher group=masher +- name: add masher koji ca cert + action: copy src=$private/files/koji/buildercerts/fedora-ca.cert dest=/home/masher/.fedora-server-ca.cert + # rawhide group - name: rawhide group action: group name=rawhide gid=265