[pkgs]: remove mentions of repospanner so that playbooks will set up things without it

This commit is contained in:
Stephen Smoogen 2020-01-14 15:47:55 +00:00 committed by Pierre-Yves Chibon
parent dbdc75e762
commit ccaa519dd3
8 changed files with 3 additions and 179 deletions

View file

@ -86,16 +86,6 @@ PDC_URL = 'https://pdc{{ env_suffix }}.fedoraproject.org/rest_api/v1/'
SSH_KEYS_USERNAME_LOOKUP = True
SSH_KEYS_OPTIONS = 'restrict,command="/usr/libexec/pagure/aclchecker.py %(username)s"'
SSH_COMMAND_REPOSPANNER = ([
"/usr/libexec/repobridge",
"--extra", "username", "%(username)s",
"--extra", "repotype", "%(repotype)s",
"--extra", "project_name", "%(project_name)s",
"--extra", "project_user", "%(project_user)s",
"--extra", "project_namespace", "%(project_namespace)s",
"%(cmd)s",
"'pagure/%(repotype)s/%(reponame)s'",
], {"REPOBRIDGE_CONFIG": "/etc/repobridge/rpms.json"})
SSH_COMMAND_NON_REPOSPANNER = ([
"/usr/libexec/git-core/%(cmd)s",
"%(repopath)s",
@ -111,28 +101,4 @@ EXTERNAL_COMMITTER = {
{% if env == "staging" %}
ACL_DEBUG = True
# repoSpanner setup
# For now, repoSpanner is enabled on a per-repo basis
REPOSPANNER_NEW_REPO = None
REPOSPANNER_NEW_REPO_ADMIN_OVERRIDE = True
REPOSPANNER_NEW_FORK = True
REPOSPANNER_ADMIN_MIGRATION = True
REPOSPANNER_REGIONS = {
'rpms': {'url': 'https://fedora01.rpms.stg.fedoraproject.org:{{ repoSpanner_rpms_http }}',
'repo_prefix': 'pagure/',
{% if env == "staging" %}
'hook': '06cd5acb2d774491e02bc0dd4dc1555ab5664a6a',
{% else %}
'hook': '0000000000000000000000000000000000000000',
{% endif %}
'ca': '/etc/pagure/ca.crt',
'admin_cert': {'cert': '/etc/pagure/fedora_rpms_admin.crt',
'key': '/etc/pagure/fedora_rpms_admin.key'},
'push_cert': {'cert': '/etc/pagure/fedora_rpms_push.crt',
'key': '/etc/pagure/fedora_rpms_push.key'}
}
}
REPOSPANNER_PSEUDO_FOLDER = '/srv/git/repositories/pseudo'
{% endif %}