diff --git a/roles/distgit/pagure/templates/pagure_shared.cfg b/roles/distgit/pagure/templates/pagure_shared.cfg index 862a93ef68..79411a1070 100644 --- a/roles/distgit/pagure/templates/pagure_shared.cfg +++ b/roles/distgit/pagure/templates/pagure_shared.cfg @@ -80,6 +80,26 @@ ALLOW_HTTP_PUSH = True 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/share/gitolite3/gitolite-shell", + "%(username)s", + "%(cmd)s", + "%(reponame)s", +], {}) + + {% if env == "staging" %} ACL_DEBUG = True @@ -102,23 +122,5 @@ REPOSPANNER_REGIONS = { } } REPOSPANNER_PSEUDO_FOLDER = '/srv/git/repositories/pseudo' -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/share/gitolite3/gitolite-shell", - "%(username)s", - "%(cmd)s", - "%(reponame)s", -], {}) {% endif %}