diff --git a/roles/distgit/pagure/templates/pagure.cfg b/roles/distgit/pagure/templates/pagure.cfg index ac21ac7bf4..1c6cf0039c 100644 --- a/roles/distgit/pagure/templates/pagure.cfg +++ b/roles/distgit/pagure/templates/pagure.cfg @@ -214,11 +214,7 @@ LOGGING = { # Configuration item that are specific for this odd pagure instance ENABLE_UI_NEW_PROJECTS = False -{% if env == 'staging' %} ALLOWED_PREFIX = ['rpms', 'modules', 'flatpaks', 'container', 'tests'] -{% else %} -ALLOWED_PREFIX = ['rpms', 'modules', 'container', 'tests'] -{% endif %} EXCLUDE_GROUP_INDEX = ['packager'] PRIVATE_PROJECTS = False {% if env == 'staging' %} @@ -248,9 +244,7 @@ ACLS = { REQUIRED_GROUPS = { 'container/*': ['packager'], -{% if env == 'staging' %} 'flatpaks/*': ['packager'], -{% endif %} 'modules/*': ['packager'], 'rpms/*': ['packager'], } diff --git a/roles/mbs/common/templates/config.py b/roles/mbs/common/templates/config.py index e8a10ecefa..89d7709be0 100644 --- a/roles/mbs/common/templates/config.py +++ b/roles/mbs/common/templates/config.py @@ -158,7 +158,10 @@ class ProdConfiguration(BaseConfiguration): PDC_URL = 'https://pdc.fedoraproject.org/rest_api/v1' SCMURLS = ['git+https://src.fedoraproject.org/modules/', 'https://src.fedoraproject.org/modules/', - 'https://src.fedoraproject.org/git/modules/'] + 'https://src.fedoraproject.org/git/modules/', + 'git+https://src.fedoraproject.org/flatpaks/', + 'https://src.fedoraproject.org/flatpaks/', + 'https://src.fedoraproject.org/git/flatpaks/'] {% endif %} RESOLVER = "db"