From bf27d7153d8fcea87a93e334fe706d56d8f4f678 Mon Sep 17 00:00:00 2001 From: Pierre-Yves Chibon Date: Wed, 31 Oct 2018 12:14:20 +0100 Subject: [PATCH] Install the different configuration file properly Signed-off-by: Pierre-Yves Chibon --- roles/ci_resultsdb/tasks/main.yml | 20 ++++++++--- roles/ci_resultsdb/templates/endpoints.py | 41 +++++++++++++++++++++++ roles/ci_resultsdb/templates/listener.cfg | 6 ++++ 3 files changed, 63 insertions(+), 4 deletions(-) create mode 100644 roles/ci_resultsdb/templates/endpoints.py create mode 100644 roles/ci_resultsdb/templates/listener.cfg diff --git a/roles/ci_resultsdb/tasks/main.yml b/roles/ci_resultsdb/tasks/main.yml index e82dfb24e5..06bceee044 100644 --- a/roles/ci_resultsdb/tasks/main.yml +++ b/roles/ci_resultsdb/tasks/main.yml @@ -16,10 +16,22 @@ tags: - config -- name: generate ci-resultsdb config - template: src=ci-resultsdb-listener.py - dest=/etc/fedmsg.d/ci-resultsdb-listener.py - owner=root group=root mode=0644 +- name: Create /etc/ci-resultsdb-listener/ + file: name=/etc/ci-resultsdb-listener/ + state=directory + recurse=yes + owner=root group=root + tags: + - config + +- name: generate ci-resultsdb config files + template: src={{ item.file }} + dest={{ item.location }}/{{ item.file }} + owner=root group=root mode=0644 + with_items: + - { file: listerner.cfg, location: /etc/ci-resultsdb-listener/ } + - { file: endpoints.py, location: /etc/fedmsg.d/ } + - { file: ci-resultsdb-listener.py, location: /etc/fedmsg.d/ } notify: - reload httpd diff --git a/roles/ci_resultsdb/templates/endpoints.py b/roles/ci_resultsdb/templates/endpoints.py new file mode 100644 index 0000000000..22258c0c26 --- /dev/null +++ b/roles/ci_resultsdb/templates/endpoints.py @@ -0,0 +1,41 @@ +# This file is part of fedmsg. +# Copyright (C) 2012 Red Hat, Inc. +# +# fedmsg is free software; you can redistribute it and/or +# modify it under the terms of the GNU Lesser General Public +# License as published by the Free Software Foundation; either +# version 2.1 of the License, or (at your option) any later version. +# +# fedmsg is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +# Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with fedmsg; if not, write to the Free Software +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA +# +# Authors: Ralph Bean +# +config = dict( + # This is a dict of possible addresses from which fedmsg can send + # messages. fedmsg.init(...) requires that a 'name' argument be passed + # to it which corresponds with one of the keys in this dict. + endpoints={ + # These are here so your local box can listen to the upstream + # infrastructure's bus. Cool, right? :) + "fedora-infrastructure": [ + "tcp://hub.fedoraproject.org:9940", + "tcp://fedmsg-relay.ci.centos.org:9940", + # "tcp://stg.fedoraproject.org:9940", + ], + # "debian-infrastructure": [ + # "tcp://fedmsg.olasd.eu:9940", + # ], + # "anitya-public-relay": [ + # "tcp://release-monitoring.org:9940", + # ], + }, + status_directory='/var/run/fedmsg/status', + datagrepper_url="https://apps.fedoraproject.org/datagrepper/raw", +) diff --git a/roles/ci_resultsdb/templates/listener.cfg b/roles/ci_resultsdb/templates/listener.cfg new file mode 100644 index 0000000000..0c96024a26 --- /dev/null +++ b/roles/ci_resultsdb/templates/listener.cfg @@ -0,0 +1,6 @@ +[general] +datagrepper_url = https://apps.fedoraproject.org/datagrepper/raw + +[sender] +sender_type = ResultsdbSender +resultsdb_url = http://127.0.0.1/resultsdb_api/api/v2.0/