diff --git a/roles/sigul/bridge/files/koji-primary.conf b/roles/sigul/bridge/files/koji-primary.conf new file mode 100644 index 0000000000..61d93f5b60 --- /dev/null +++ b/roles/sigul/bridge/files/koji-primary.conf @@ -0,0 +1,25 @@ +[koji] + +;configuration for koji cli tool + +;url of XMLRPC server +server = http://koji.fedoraproject.org/kojihub + +;url of web interface +weburl = http://koji.fedoraproject.org/koji + +;url of package download site +topurl = https://kojipkgs.fedoraproject.org/ + +;path to the koji top directory +;topdir = /mnt/koji + +anon_retry = true + +;configuration for SSL authentication + +;client certificate +cert = ~/.fedora.cert + +;certificate of the CA that issued the HTTP server certificate +serverca = ~/.fedora-server-ca.cert diff --git a/roles/sigul/bridge/files/koji-primary.stg.conf b/roles/sigul/bridge/files/koji-primary.stg.conf new file mode 100644 index 0000000000..7a63ca5974 --- /dev/null +++ b/roles/sigul/bridge/files/koji-primary.stg.conf @@ -0,0 +1,21 @@ +[koji] + +;configuration for koji cli tool + +;url of XMLRPC server +server = http://koji.stg.fedoraproject.org/kojihub + +;url of web interface +weburl = http://koji.stg.fedoraproject.org/koji + +;url of package download site +topurl = http://kojipkgs.stg.fedoraproject.org/ + + +;configuration for SSL athentication + +;client certificate +cert = ~/.fedora.cert + +;certificate of the CA that issued the HTTP server certificate +serverca = ~/.fedora-server-ca.cert diff --git a/roles/sigul/bridge/tasks/main.yml b/roles/sigul/bridge/tasks/main.yml index c9f701473e..2429d57854 100644 --- a/roles/sigul/bridge/tasks/main.yml +++ b/roles/sigul/bridge/tasks/main.yml @@ -9,6 +9,14 @@ tags: - config +- name: Setup primary koji config file + copy: src=koji-primary.conf dest=/etc/koji-primary.conf owner=root group=root mode=644 + when: inventory_hostname.startswith('sign') and env == "production" + +- name: Setup primary stg koji config file + copy: src=koji-primary.stg.conf dest=/etc/koji-primary.conf owner=root group=root mode=644 + when: inventory_hostname.startswith('sign') and env == "staging" + - name: Setup secondary koji config files copy: src={{ item }} dest=/etc/{{ item }} owner=root group=root mode=644 with_items: diff --git a/roles/sigul/bridge/templates/bridge.conf.j2 b/roles/sigul/bridge/templates/bridge.conf.j2 index 4490eb8ad1..1f09d258f6 100644 --- a/roles/sigul/bridge/templates/bridge.conf.j2 +++ b/roles/sigul/bridge/templates/bridge.conf.j2 @@ -20,8 +20,11 @@ required-fas-group: signers fas-user-name: {{ fedoraDummyUser }} fas-password: {{ fedoraDummyUserPassword }} -{% if inventory_hostname.startswith('secondary') %} [koji] +{% if inventory_hostname.startswith('sign') %} +koji-instances: primary +koji-config-ppc: /etc/koji-primary.conf +{% else %} koji-instances: ppc s390 arm sparc koji-config-ppc: /etc/koji-ppc.conf koji-config-s390: /etc/koji-s390.conf