From e4c35eb49477e845030fd435c87261bec35c950e Mon Sep 17 00:00:00 2001 From: Ralph Bean Date: Mon, 23 Jun 2014 20:22:01 +0000 Subject: [PATCH] Add generic fedmsg config for bugzilla2fedmsg. --- roles/fedmsg/base/tasks/main.yml | 1 + .../base/templates/endpoints-bugzilla2fedmsg.py.j2 | 13 +++++++++++++ roles/fedmsg/base/templates/ssl.py.j2 | 4 ++++ 3 files changed, 18 insertions(+) create mode 100644 roles/fedmsg/base/templates/endpoints-bugzilla2fedmsg.py.j2 diff --git a/roles/fedmsg/base/tasks/main.yml b/roles/fedmsg/base/tasks/main.yml index aa132c0d02..28e2f2d14b 100644 --- a/roles/fedmsg/base/tasks/main.yml +++ b/roles/fedmsg/base/tasks/main.yml @@ -42,6 +42,7 @@ - endpoints-summershum.py - endpoints-kerneltest.py - endpoints-github2fedmsg.py + - endpoints-bugzilla2fedmsg.py - relay.py - pkgdb.py - logging.py diff --git a/roles/fedmsg/base/templates/endpoints-bugzilla2fedmsg.py.j2 b/roles/fedmsg/base/templates/endpoints-bugzilla2fedmsg.py.j2 new file mode 100644 index 0000000000..f73c56e0cc --- /dev/null +++ b/roles/fedmsg/base/templates/endpoints-bugzilla2fedmsg.py.j2 @@ -0,0 +1,13 @@ +{% if env == 'staging' %} +suffix = 'stg.phx2.fedoraproject.org' +{% else %} +suffix = 'phx2.fedoraproject.org' +{% endif %} + +config = dict( + endpoints={ + "bugzilla2fedmsg.bugzilla2fedmsg01": [ + "tcp://bugzilla2fedmsg01.%s:3000" % suffix, + ], + }, +) diff --git a/roles/fedmsg/base/templates/ssl.py.j2 b/roles/fedmsg/base/templates/ssl.py.j2 index f9445c2e24..7ff5fed0b6 100644 --- a/roles/fedmsg/base/templates/ssl.py.j2 +++ b/roles/fedmsg/base/templates/ssl.py.j2 @@ -25,6 +25,10 @@ config = dict( certnames=dict( [ + ("bugzilla2fedmsg.bugzilla2fedmsg01", "bugzilla2fedmsg-bugzilla2fedmsg01.%s" % suffix) + ] + [ + ("shell.bugzilla2fedmsg01", "shell-bugzilla2fedmsg01.%s" % suffix) + ] + [ ("github2fedmsg.github2fedmsg0%i" % i, "github2fedmsg-github2fedmsg0%i.%s" % (i, suffix)) for i in range(1, 3) ] + [