From 9cb1e5c24810d01f321c755f5cf5b1a93def6afb Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Wed, 10 Apr 2019 19:49:18 +0200 Subject: [PATCH] koji/hub: Enable package_list policy in production --- roles/koji_hub/templates/hub.conf.j2 | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) diff --git a/roles/koji_hub/templates/hub.conf.j2 b/roles/koji_hub/templates/hub.conf.j2 index b58c9a67e3..42717b1fda 100644 --- a/roles/koji_hub/templates/hub.conf.j2 +++ b/roles/koji_hub/templates/hub.conf.j2 @@ -77,9 +77,8 @@ DisableNotifications = True #Plugins = darkserver-plugin Plugins = fedmsg-koji-plugin runroot_hub hub_containerbuild -{% if inventory_hostname.startswith('koji') %} -[policy] +[policy] tag = user mbs/mbs.fedoraproject.org && tag module-* && package kernel shim grub2 fedora-release fedora-repos pesign :: allow @@ -123,16 +122,11 @@ channel = all :: use default - build_from_srpm = has_perm admin :: allow tag *-infra-candidate && has_perm infra :: allow all :: deny -{% endif %} - - -{% if env == 'staging' %} # Policy for manipulating package lists for tags. package_list = @@ -158,5 +152,3 @@ package_list = tag f{{FedoraRawhideNumber}}-coreos-continuous f{{FedoraBranchedNumber}}-coreos-continuous f{{FedoraCycleNumber}}-coreos-continuous f{{FedoraPreviousCycleNumber}}-coreos-continuous && has_perm coreos-continuous && match action add unblock block :: allow # Catch-all rule. all :: deny - -{% endif %}