From 890d01ce47dd80c43685926c51be8fbd9a6d93e8 Mon Sep 17 00:00:00 2001 From: Michael Simacek Date: Mon, 14 Aug 2017 17:19:19 +0200 Subject: [PATCH] Disable koschei-pkgdb integration --- .../backend/templates/config-backend.cfg.j2 | 26 ++--------------- .../frontend/templates/config-frontend.cfg.j2 | 29 ++----------------- 2 files changed, 4 insertions(+), 51 deletions(-) diff --git a/roles/koschei/backend/templates/config-backend.cfg.j2 b/roles/koschei/backend/templates/config-backend.cfg.j2 index 608cf3b405..57c665af9d 100644 --- a/roles/koschei/backend/templates/config-backend.cfg.j2 +++ b/roles/koschei/backend/templates/config-backend.cfg.j2 @@ -85,9 +85,9 @@ config = { }, }, {% if env == 'staging' %} - "plugins": ['pkgdb', 'fedmsg', 'copr'], + "plugins": ['fedmsg', 'copr'], {% else %} - "plugins": ['pkgdb', 'fedmsg'], + "plugins": ['fedmsg'], {% endif %} "fedmsg": { {% if env == 'staging' %} @@ -109,28 +109,6 @@ config = { "distributed_lock": True, }, }, - "plugin": { - "pkgdb": { - "users": { - "backend": "dogpile.cache.memcached", - "expiration_time": 300, - "arguments": { - "url": "memcached01", - "distributed_lock": True, - }, - }, - }, - }, - }, - "pkgdb": { - {% if env == 'staging' %} - "pkgdb_url": 'https://admin.stg.fedoraproject.org/pkgdb/api', - "topic_re": r'\.stg\.pkgdb\.', - {% else %} - "pkgdb_url": 'https://admin.fedoraproject.org/pkgdb/api', - "topic_re": r'\.prod\.pkgdb\.', - {% endif %} - "sync_tracked": True, }, "copr": { "require_admin": True, diff --git a/roles/koschei/frontend/templates/config-frontend.cfg.j2 b/roles/koschei/frontend/templates/config-frontend.cfg.j2 index d89d61894b..a99b7ad838 100644 --- a/roles/koschei/frontend/templates/config-frontend.cfg.j2 +++ b/roles/koschei/frontend/templates/config-frontend.cfg.j2 @@ -39,36 +39,13 @@ config = { }, }, {% if env == 'staging' %} - "plugins": ['pkgdb', 'copr'], + "plugins": ['copr'], {% else %} - "plugins": ['pkgdb'], + "plugins": [], {% endif %} "caching": { - "plugin": { - "pkgdb": { - "users": { - "backend": "dogpile.cache.memcached", - "expiration_time": 300, - "arguments": { - "url": "memcached01:11211", - "distributed_lock": True, - }, - }, - }, - }, - }, - "pkgdb": { - {% if env == 'staging' %} - "pkgdb_url": 'https://admin.stg.fedoraproject.org/pkgdb/api', - "topic_re": r'\.stg\.pkgdb\.', - {% else %} - "pkgdb_url": 'https://admin.fedoraproject.org/pkgdb/api', - "topic_re": r'\.prod\.pkgdb\.', - {% endif %} - "sync_tracked": True, }, "frontend": { - "auto_tracking": True, "builds_per_page": 8, "auth": { "user_re": "http://(.+)\\.id{{ env_prefix }}\\.fedoraproject\\.org/", @@ -89,8 +66,6 @@ config = { "links": [ {"name": "Packages", "url": "https://apps{{ env_prefix }}.fedoraproject.org/packages/{package.name}"}, - {"name": "PkgDB", - "url": "https://admin{{ env_prefix }}.fedoraproject.org/pkgdb/package/{package.name}"}, {"name": "Bodhi", "url": "https://bodhi{{ env_prefix }}.fedoraproject.org/updates?packages={package.name}"}, {"name": "Dist-git",