More staging config for the-new-hotness.

This commit is contained in:
Ralph Bean 2014-11-19 21:42:58 +00:00
parent f639ffd306
commit 5facace9ec
2 changed files with 56 additions and 5 deletions

View file

@ -22,3 +22,28 @@
tags:
- config
- hotness
- name: install hotness.pem koji key and cert
copy: >
src="{{ puppet_private }}/hotness_key_and_cert.pem"
dest="/etc/pki/fedmsg/hotness.pem"
owner=fedmsg
group=fedmsg
mode=0400
tags:
- config
- hotness
- name: install koji ca cert
copy: >
src="{{ puppet_private }}/fedora-ca.cert"
dest="/etc/pki/fedmsg/{{ item }}"
owner=root
group=root
mode=0644
with_items:
- fedora-server-ca.cert
- fedora-upload-ca.cert
tags:
- config
- hotness

View file

@ -23,24 +23,44 @@ config = {
'hotness.bugzilla.enabled': True,
'hotness.bugzilla': {
#'user': None,
#'password': None,
'user': '{{ bugzilla_user }}',
'password': '{{ bugzilla_password }}',
{% if env == 'staging' %}
'url': 'https://partner-bugzilla.redhat.com',
'explanation_url': 'https://stg.fedoraproject.org/wiki/Upstream_release_monitoring',
{% else %}
'url': 'https://bugzilla.redhat.com',
'explanation_url': 'https://fedoraproject.org/wiki/Upstream_release_monitoring',
{% endif %}
'product': 'Fedora',
'version': 'rawhide',
'keywords': 'FutureFeature,Triaged',
'bug_status': 'NEW',
'explanation_url': 'https://fedoraproject.org/wiki/Upstream_release_monitoring',
'short_desc_template': "%(name)s-%(latest_upstream)s is available",
'description_template': description_template,
},
'hotness.koji': {
{% if env == 'staging' %}
'server': 'https://koji.stg.fedoraproject.org/kojihub',
'weburl': 'http://koji.stg.fedoraproject.org/koji',
# TODO - I'd like to use staging gitolite, but it is broken right now?
#'git_url': 'http://pkgs.stg.fedoraproject.org/cgit/{package}.git',
'git_url': 'http://pkgs.fedoraproject.org/cgit/{package}.git',
{% else %}
'server': 'https://koji.fedoraproject.org/kojihub',
'weburl': 'http://koji.fedoraproject.org/koji',
'cert': os.path.expanduser('~/.fedora.cert'),
'ca_cert': os.path.expanduser('~/.fedora-server-ca.cert'),
'git_url': 'http://pkgs.fedoraproject.org/cgit/{package}.git',
{% endif %}
# This cert is generated by sshing as root to fas01 and running
# $ cd /var/lib/fedora-ca
# $ python certhelper.py normal --outdir=/var/tmp/ \
# --name=hotness --cadir=. --caname=Fedora
# Then scp the cert to lockbox01 into the private dir.
'cert': '/etc/pki/fedmsg/hotness.pem',
'ca_cert': '/etc/pki/fedmsg/fedora-server-ca.cert',
'userstring': ('Fedora Release Monitoring '
'<release-monitoring@fedoraproject.org>'),
'opts': {'scratch': True},
@ -48,6 +68,12 @@ config = {
'target_tag': 'rawhide',
},
{% if env == 'staging' %}
'hotness.pkgdb_url': 'https://admin.stg.fedoraproject.org/pkgdb/api',
{% else %}
'hotness.pkgdb_url': 'https://admin.fedoraproject.org/pkgdb/api',
{% endif %}
"hotness.cache": {
"backend": "dogpile.cache.dbm",
"expiration_time": 300,