[pagure] put back changes into configs I whacked earlier
This commit is contained in:
parent
2c05b41e5f
commit
d05626d43c
3 changed files with 29 additions and 0 deletions
|
@ -43,6 +43,13 @@ AcceptEnv LC_PAPER LC_NAME LC_ADDRESS LC_TELEPHONE LC_MEASUREMENT
|
|||
AcceptEnv LC_IDENTIFICATION LC_ALL LANGUAGE
|
||||
AcceptEnv XMODIFIERS
|
||||
|
||||
{% if sshd_keyhelper %}
|
||||
# For repospanner/git
|
||||
AuthorizedKeysCommandUser git
|
||||
AuthorizedKeysCommand /usr/libexec/pagure/keyhelper.py "%u" "%h" "%t" "%f"
|
||||
{% endif %}
|
||||
|
||||
|
||||
{% if sshd_sftp %}
|
||||
Subsystem sftp internal-sftp
|
||||
{% endif %}
|
||||
|
|
|
@ -86,6 +86,17 @@ 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",
|
||||
|
|
|
@ -332,12 +332,23 @@ MIRROR_SSHKEYS_FOLDER='/srv/mirror/ssh'
|
|||
SSH_KEYS_USERNAME_EXPECT = "git"
|
||||
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",
|
||||
"'%(repotype)s/%(reponame)s'",
|
||||
], {"REPOBRIDGE_CONFIG": "/etc/pagure/repobridge_ansible.json"})
|
||||
SSH_COMMAND_NON_REPOSPANNER = ([
|
||||
"/usr/bin/%(cmd)s",
|
||||
"/srv/git/repositories/%(reponame)s",
|
||||
], {"GL_USER": "%(username)s"})
|
||||
|
||||
|
||||
|
||||
GIT_AUTH_BACKEND = 'pagure'
|
||||
HTTP_REPO_ACCESS_GITOLITE = None
|
||||
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue