From 2380d34c4d69c90ead77bddf0fb7d6786117580d Mon Sep 17 00:00:00 2001 From: Ralph Bean Date: Fri, 3 Oct 2014 15:02:44 +0000 Subject: [PATCH] Lots of pruning for anitya fedmsg. --- roles/anitya/fedmsg/templates/base.py.j2 | 28 +--- roles/anitya/fedmsg/templates/ssl.py.j2 | 176 +---------------------- 2 files changed, 3 insertions(+), 201 deletions(-) diff --git a/roles/anitya/fedmsg/templates/base.py.j2 b/roles/anitya/fedmsg/templates/base.py.j2 index b658188b19..6aa831b3e0 100644 --- a/roles/anitya/fedmsg/templates/base.py.j2 +++ b/roles/anitya/fedmsg/templates/base.py.j2 @@ -1,31 +1,7 @@ config = dict( - # Set this to dev if you're hacking on fedmsg or an app locally. - # Set to stg or prod if running in the Fedora Infrastructure. - {% if env == 'staging' %} - environment="stg", - {% else %} + topic_prefix="org.release-monitoring", + environment="prod", - {% endif %} - - {% if not ansible_hostname.startswith('busgateway') %} - # These options provide a place for hub processes to write out their last - # processed message. This let's them read it in at startup and figure out - # what kind of backlog they have to deal with. - {% if env == 'staging' %} - # But we have it turned off in staging. - #status_directory="/var/run/fedmsg/status", - {% else %} - status_directory="/var/run/fedmsg/status", - {% endif %} - - # This is the URL of a datagrepper instance that we can query for backlog. - {% if env == 'staging' %} - # But we have it turned off in staging. - #datagrepper_url="https://apps.stg.fedoraproject.org/datagrepper/raw", - {% else %} - datagrepper_url="https://apps.fedoraproject.org/datagrepper/raw", - {% endif %} - {% endif %} # This used to be set to 1 for safety, but it turns out it was # excessive. It is the number of seconds that fedmsg should sleep diff --git a/roles/anitya/fedmsg/templates/ssl.py.j2 b/roles/anitya/fedmsg/templates/ssl.py.j2 index 2a55f4e1a8..a862ede110 100644 --- a/roles/anitya/fedmsg/templates/ssl.py.j2 +++ b/roles/anitya/fedmsg/templates/ssl.py.j2 @@ -1,192 +1,18 @@ -{% if env == 'staging' %} -suffix = "stg.phx2.fedoraproject.org" -topic_prefix = "org.fedoraproject.stg." -{% else %} -suffix = "phx2.fedoraproject.org" -topic_prefix = "org.fedoraproject.prod." -{% endif %} - -vpn_suffix = "vpn.fedoraproject.org" - config = dict( sign_messages=True, validate_signatures=True, ssldir="/etc/pki/fedmsg", - {% if env == 'staging' %} - # In staging, we use the internal IP of proxy01 without ssl. - crl_location="http://10.5.126.88/fedmsg/crl.pem", - {% else %} crl_location="https://fedoraproject.org/fedmsg/crl.pem", - {% endif %} crl_cache="/var/run/fedmsg/crl.pem", crl_cache_expiry=86400, # Daily - certnames=dict( - [ - ("bugzilla.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) - ] + [ - ("shell.github2fedmsg0%i" % i, "shell-github2fedmsg0%i.%s" % (i, suffix)) - for i in range(1, 3) - ] + [ - ("fedimg.fedimg01", "fedimg-fedimg01.%s" % suffix), - ("shell.fedimg01", "shell-fedimg01.%s" % suffix), - ] + [ - ("kerneltest.kerneltest0%i" % i, "kerneltest-kerneltest0%i.%s" % (i, suffix)) - for i in range(1, 3) - ] + [ - ("shell.kerneltest0%i" % i, "shell-kerneltest0%i.%s" % (i, suffix)) - for i in range(1, 3) - ] + [ - ("shell.notifs-web0%i" % i, "shell-notifs-web0%i.%s" % (i, suffix)) - for i in range(1, 3) - ] + [ - ("fmn.notifs-web0%i" % i, "fmn-notifs-web0%i.%s" % (i, suffix)) - for i in range(1, 3) - ] + [ - ("fmn.notifs-backend01", "fmn-notifs-backend01.%s" % suffix), - ] + [ - ("shell.pkgdb0%i" % i, "shell-pkgdb0%i.%s" % (i, suffix)) - for i in range(1, 3) - ] + [ - ("pkgdb2.pkgdb0%i" % i, "pkgdb-pkgdb0%i.%s" % (i, suffix)) - for i in range(1, 3) - ] + [ - ("mediawiki.wiki0%i" % i, "mediawiki-wiki0%i.%s" % (i, suffix)) - for i in range(1, 3) - ] + [ - ("shell.fas0%i" % i, "shell-fas0%i.%s" % (i, suffix)) - for i in range(1, 4) - ] + [ - ("fas.fas0%i" % i, "fas-fas0%i.%s" % (i, suffix)) - for i in range(1, 4) - ] + [ - ("shell.packages0%i" % i, "shell-packages0%i.%s" % (i, suffix)) - for i in range(3, 5) - ] + [ - ("fedoratagger.tagger0%i" % i, "fedoratagger-tagger0%i.%s" % (i, suffix)) - for i in range(1, 3) - ] + [ - ("shell.tagger0%i" % i, "shell-tagger0%i.%s" % (i, suffix)) - for i in range(1, 3) - ] + [ - ("shell.pkgs0%i" % i, "shell-pkgs0%i.%s" % (i, suffix)) - for i in range(1, 2) - ] + [ - ("scm.pkgs0%i" % i, "scm-pkgs0%i.%s" % (i, suffix)) - for i in range(1, 2) - ] + [ - ("lookaside.pkgs0%i" % i, "lookaside-pkgs0%i.%s" % (i, suffix)) - for i in range(1, 2) - ] + [ - ("shell.relepel01", "shell-relepel01.%s" % suffix), - ("shell.branched-composer", "shell-branched-composer.%s" % suffix), - ("shell.rawhide-composer", "shell-rawhide-composer.%s" % suffix), - ("shell.releng03", "shell-releng03.%s" % suffix), - ("shell.releng04", "shell-releng04.%s" % suffix), - ("bodhi.relepel01", "bodhi-relepel01.%s" % suffix), - ("bodhi.branched-composer", "bodhi-branched-composer.%s" % suffix), - ("bodhi.rawhide-composer", "bodhi-rawhide-composer.%s" % suffix), - ("bodhi.releng03", "bodhi-releng03.%s" % suffix), - ("bodhi.releng04", "bodhi-releng04.%s" % suffix), - ] + [ - ("ftpsync.relepel01", "ftpsync-relepel01.%s" % suffix), - ("ftpsync.releng04", "ftpsync-releng04.%s" % suffix), - ] + [ - ("shell.busgateway01", "shell-busgateway01.%s" % suffix), - ] + [ - ("shell.value01", "shell-value01.%s" % suffix), - ("supybot.value01", "supybot-value01.%s" % suffix), - ] + [ - ("koji.koji04", "koji-koji04.%s" % suffix), - ("koji.koji01", "koji-koji01.%s" % suffix), - ("koji.koji03", "koji-koji03.%s" % suffix), - ("shell.koji04", "shell-koji04.%s" % suffix), - ("shell.koji01", "shell-koji01.%s" % suffix), - ("shell.koji03", "shell-koji03.%s" % suffix), - ] + [ - ("nagios.noc01", "nagios-noc01.%s" % suffix), - ("shell.noc01", "shell-noc01.%s" % suffix), - ] + [ - ("git.hosted03", "git-hosted03.%s" % vpn_suffix), - ("git.hosted04", "git-hosted04.%s" % vpn_suffix), - ("trac.hosted03", "trac-hosted03.%s" % vpn_suffix), - ("trac.hosted04", "trac-hosted04.%s" % vpn_suffix), - ("shell.hosted03", "shell-hosted03.%s" % vpn_suffix), - ("shell.hosted04", "shell-hosted04.%s" % vpn_suffix), - ] + [ - ("shell.lockbox01", "shell-lockbox01.%s" % suffix), - ("announce.lockbox01", "announce-lockbox01.%s" % suffix), - ] + [ - # These first two entries are here to placate a bug in - # python-askbot-fedmsg-0.0.4. They can be removed once - # python-askbot-fedmsg-0.0.5 hits town. - ("askbot.ask01.phx2.fedoraproject.org", "askbot-ask01.%s" % suffix), - ("askbot.ask01.stg.phx2.fedoraproject.org", "askbot-ask01.%s" % suffix), - - ("askbot.ask01", "askbot-ask01.%s" % suffix), - ("shell.ask01", "shell-ask01.%s" % suffix), - - ("askbot.ask02", "askbot-ask02.%s" % suffix), - ("shell.ask02", "shell-ask02.%s" % suffix), - - ("fedbadges.badges-backend01", "fedbadges-badges-backend01.%s" % suffix), - ("shell.badges-backend01", "shell-badges-backend01.%s" % suffix), - - ("summershum.summershum01", "summershum-summershum01.%s" % suffix), - ("shell.summershum01", "shell-summershum01.%s" % suffix), - - ("tahrir.badges-web01", "tahrir-badges-web01.%s" % suffix), - ("shell.badges-web01", "shell-badges-web01.%s" % suffix), - ("tahrir.badges-web02", "tahrir-badges-web02.%s" % suffix), - ("shell.badges-web02", "shell-badges-web02.%s" % suffix), - - ("shell.nuancier01", "shell-nuancier01.%s" % suffix), - ("shell.nuancier02", "shell-nuancier02.%s" % suffix), - ("nuancier.nuancier01", "nuancier-nuancier01.%s" % suffix), - ("nuancier.nuancier02", "nuancier-nuancier02.%s" % suffix), - - ("shell.fedocal01", "shell-fedocal01.%s" % suffix), - ("shell.fedocal02", "shell-fedocal02.%s" % suffix), - ("fedocal.fedocal01", "fedocal-fedocal01.%s" % suffix), - ("fedocal.fedocal02", "fedocal-fedocal02.%s" % suffix), - - ("shell.mailman01", "shell-mailman01.%s" % suffix), - ("mailman.mailman01", "mailman-mailman01.%s" % suffix), - - ("shell.bodhi01", "shell-bodhi01.%s" % suffix), - ("shell.bodhi02", "shell-bodhi02.%s" % suffix), - ("bodhi.bodhi01", "bodhi-bodhi01.%s" % suffix), - ("bodhi.bodhi02", "bodhi-bodhi02.%s" % suffix), - - ("shell.elections01", "shell-elections01.%s" % suffix), - ("shell.elections02", "shell-elections02.%s" % suffix), - ("fedora_elections.elections01", "fedora_elections-elections01.%s" % suffix), - ("fedora_elections.elections02", "fedora_elections-elections02.%s" % suffix), - + certnames=dict([ ("shell.anitya-frontend01", "shell-anitya-frontend01.fedoraproject.org"), ("anitya.anitya-frontend01", "anitya-anitya-frontend01.fedoraproject.org"), ("shell.anitya-backend01", "shell-anitya-backend01.fedoraproject.org"), ("anitya.anitya-backend01", "anitya-anitya-backend01.fedoraproject.org"), - - # This is for the copr backend, which is a little different. The - # "cert-prefix" is just "copr", and is hardcoded in - # backend/dispatcher.py. The hostname is also a little different, - # since it is an openstack node. This might be a little fragile. :/ - # See https://github.com/fedora-infra/fedmsg/issues/199 for the plan. - ("copr.dhcp-client03", "copr-copr-be.cloud.fedoraproject.org"), - ("copr.copr-be-i-00000407", "copr-copr-be.cloud.fedoraproject.org"), - ("copr.copr-be", "copr-copr-be.cloud.fedoraproject.org"), - - # Jenkins, also being a cloud node, is weird. Like copr. - ("shell.jenkins-master-unknown", "shell-jenkins.cloud.fedoraproject.org"), - ("jenkins.jenkins-master-unknown", "jenkins-jenkins.cloud.fedoraproject.org"), ]), )