From 592df2cf9b13502793745628a8637d5d0ba0b3c0 Mon Sep 17 00:00:00 2001 From: Neal Gompa Date: Oct 31 2020 15:25:47 +0000 Subject: pagure: Configure aclchecker correctly in pagure.cfg Pagure defaults to /usr/libexec/pagure/aclchecker.py in the code, and we currently install it to /usr/lib/pagure, so we need to set the correct override. --- diff --git a/salt/profile/pagure/files/pagure.cfg b/salt/profile/pagure/files/pagure.cfg index 282eb5b..2ea0afc 100644 --- a/salt/profile/pagure/files/pagure.cfg +++ b/salt/profile/pagure/files/pagure.cfg @@ -116,6 +116,12 @@ SSH_COMMAND_NON_REPOSPANNER = ([ "/srv/gitolite/repositories/%(reponame)s", ], {"GL_USER": "%(username)s"}) +# Arguments to add to the SSH keys, possible replacements: +# %(username)s: username owning this key +SSH_KEYS_OPTIONS = ( + 'restrict,command="/usr/lib/pagure/aclchecker.py %(username)s"' +) + ### Configuration file for gitolite GITOLITE_CONFIG = os.path.join( '/srv',