aboutsummaryrefslogtreecommitdiffstats
path: root/modules/openssh
diff options
context:
space:
mode:
authorOlivier Blin <mageia@blino.org>2016-02-07 23:32:57 +0100
committerOlivier Blin <mageia@blino.org>2016-02-07 23:32:57 +0100
commitdf723248417eb8671aac0119037aa272c525126d (patch)
treede9a8cc8d57683ad3ff24278f724f7fbe368d1b1 /modules/openssh
parent9691ad9acd98b3d054d34476bb5ef1e05657e911 (diff)
downloadpuppet-df723248417eb8671aac0119037aa272c525126d.tar
puppet-df723248417eb8671aac0119037aa272c525126d.tar.gz
puppet-df723248417eb8671aac0119037aa272c525126d.tar.bz2
puppet-df723248417eb8671aac0119037aa272c525126d.tar.xz
puppet-df723248417eb8671aac0119037aa272c525126d.zip
openssh: do not force command for git user
The "gitolite <username>" is already set in /var/lib/git/.ssh/authorized_keys, and we do not want to override it.
Diffstat (limited to 'modules/openssh')
-rw-r--r--modules/openssh/templates/sshd_config3
1 files changed, 2 insertions, 1 deletions
diff --git a/modules/openssh/templates/sshd_config b/modules/openssh/templates/sshd_config
index 1178a3e4..ed8c97ef 100644
--- a/modules/openssh/templates/sshd_config
+++ b/modules/openssh/templates/sshd_config
@@ -122,6 +122,7 @@ Subsystem sftp <%= path_to_sftp %>/sftp-server
# AllowTcpForwarding no
# ForceCommand cvs server
<% if @hostname == 'duvel' then %>
-Match User *,!schedbot,!root
+# git command is already forced to "gitolite <username>" in /var/lib/git/.ssh/authorized_keys
+Match User *,!schedbot,!root,!git
ForceCommand /usr/local/bin/sv_membersh.pl -c "$SSH_ORIGINAL_COMMAND"
<% end %>