From b8100fc5ff8d2cb1a186648a7c5e4570bee185f2 Mon Sep 17 00:00:00 2001 From: Clement Verna Date: Wed, 14 Feb 2018 19:43:45 +0100 Subject: [PATCH] Fix packages stg bugzilla. This commit add the correct bugzilla address for packages.stg. It also cleanup the template by making use of the env_suffix variable. Signed-off-by: Clement Verna --- .../web/templates/packages-app.ini.j2 | 23 +++++++------------ 1 file changed, 8 insertions(+), 15 deletions(-) diff --git a/roles/packages3/web/templates/packages-app.ini.j2 b/roles/packages3/web/templates/packages-app.ini.j2 index a0ad8bcfb8..cfdb5be884 100644 --- a/roles/packages3/web/templates/packages-app.ini.j2 +++ b/roles/packages3/web/templates/packages-app.ini.j2 @@ -21,24 +21,17 @@ fedoracommunity.extensions_dir = {{ pythonsitelib }}/fedoracommunity/plugins/ext fedoracommunity.script_name = /packages fedoracommunity.connector.kojihub.baseurl = https://koji{{env_suffix}}.fedoraproject.org/kojihub -fedoracommunity.connector.bugzilla.baseurl = https://bugzilla.redhat.com/xmlrpc.cgi -fedoracommunity.connector.bugzilla.cookiefile = /var/cache/fedoracommunity/bugzillacookies +fedoracommunity.connector.bodhi.baseurl = https://bodhi{{env_suffix}}.fedoraproject.org/ +fedoracommunity.connector.mdapi.baseurl = https://apps{{env_suffix}}.fedoraproject.org/mdapi +fedoracommunity.connector.tagger.baseurl = https://apps{{env_suffix}}.fedoraproject.org/tagger +fedoracommunity.connector.fas.baseurl = https://admin{{env_suffix}}.fedoraproject.org/accounts/ +fedoracommunity.connector.icons.baseurl = http://download01.phx2.fedoraproject.org/pub/alt/screenshots {% if env == "staging" %} -fedoracommunity.connector.fas.baseurl = https://admin.stg.fedoraproject.org/accounts/ -fedoracommunity.connector.bodhi.baseurl = https://bodhi.stg.fedoraproject.org/ -fedoracommunity.connector.pkgdb.baseurl = https://admin.stg.fedoraproject.org/pkgdb -fedoracommunity.connector.tagger.baseurl = https://apps.stg.fedoraproject.org/tagger -fedoracommunity.connector.mdapi.baseurl = https://apps.stg.fedoraproject.org/mdapi -fedoracommunity.connector.icons.baseurl = http://download01.phx2.fedoraproject.org/pub/alt/screenshots +fedoracommunity.connector.bugzilla.baseurl = https://partner-bugzilla.redhat.com/xmlrpc.cgi {% else %} -fedoracommunity.connector.fas.baseurl = https://admin.fedoraproject.org/accounts/ -fedoracommunity.connector.bodhi.baseurl = https://bodhi.fedoraproject.org/ -fedoracommunity.connector.pkgdb.baseurl = https://admin.fedoraproject.org/pkgdb -fedoracommunity.connector.tagger.baseurl = https://apps.fedoraproject.org/tagger -fedoracommunity.connector.mdapi.baseurl = https://apps.fedoraproject.org/mdapi -fedoracommunity.connector.icons.baseurl = http://download01.phx2.fedoraproject.org/pub/alt/screenshots +fedoracommunity.connector.bugzilla.baseurl = https://bugzilla.redhat.com/xmlrpc.cgi {% endif %} - +fedoracommunity.connector.bugzilla.cookiefile = /var/cache/fedoracommunity/bugzillacookies fedoracommunity.connector.xapian.package-search.db = /var/cache/fedoracommunity/packages/xapian/search fedoracommunity.resource_path_prefix = /packages/_res/