diff --git a/roles/hotness/templates/hotness.py b/roles/hotness/templates/hotness.py index d1ceb33fb0..f7e9e7cb0f 100644 --- a/roles/hotness/templates/hotness.py +++ b/roles/hotness/templates/hotness.py @@ -48,23 +48,20 @@ config = { 'hotness.koji': { {% if env == 'staging' %} 'server': 'https://koji.stg.fedoraproject.org/kojihub', - 'weburl': 'http://koji.stg.fedoraproject.org/koji', + 'weburl': 'https://koji.stg.fedoraproject.org/koji', 'git_url': 'http://pkgs01.stg.phx2.fedoraproject.org/cgit/rpms/{package}.git', {% else %} 'server': 'https://koji.fedoraproject.org/kojihub', - 'weburl': 'http://koji.fedoraproject.org/koji', - 'git_url': 'http://pkgs.fedoraproject.org/cgit/rpms/{package}.git', + 'weburl': 'https://koji.fedoraproject.org/koji', + 'git_url': 'https://src.fedoraproject.org/cgit/rpms/{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', + 'krb_principal': None, + 'krb_keytab': None, + 'krb_ccache': None, + 'krb_sessionopts': {'timeout': 3600, 'krb_rdns': False}, - 'userstring': ('Fedora Release Monitoring ' + 'user_email': ('Fedora Release Monitoring ', ''), 'opts': {'scratch': True}, 'priority': 30, @@ -79,12 +76,24 @@ config = { {% if env == 'staging' %} 'hotness.pkgdb_url': 'https://admin.stg.fedoraproject.org/pkgdb/api', + "hotness.mdapi_url": "https://apps.stg.fedoraproject.org/mdapi", {% else %} 'hotness.pkgdb_url': 'https://admin.fedoraproject.org/pkgdb/api', + "hotness.mdapi_url": "https://apps.fedoraproject.org/mdapi", {% endif %} 'hotness.yumconfig': '/etc/hotness-yum.conf', + # The time in seconds the-new-hotness should wait for a socket to connect + # before giving up. + 'hotness.connect_timeout': 15, + # The time in seconds the-new-hotness should wait for a read from a socket + # before giving up. + 'hotness.read_timeout': 15, + # The number of times the-new-hotness should retry a network request that + # that failed for any reason (e.g. read timeout, DNS error, etc) + 'hotness.requests_retries': 3, + "hotness.cache": { "backend": "dogpile.cache.dbm", "expiration_time": 290,