Skip to content

Commit 38096eb

Browse files
authored
Merge pull request sameersbn#3133 from aminvakil/expose_ed25519
Use ed25519 in expose-gitlab-ssh-port.sh
2 parents b6eed6a + d3141c3 commit 38096eb

File tree

1 file changed

+3
-3
lines changed

1 file changed

+3
-3
lines changed

contrib/expose-gitlab-ssh-port.sh

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,15 +10,15 @@ if ! id -u git >> /dev/null 2>&1; then
1010
fi
1111
su git -c "mkdir -p /home/git/.ssh/"
1212

13-
su git -c "if [ ! -f /home/git/.ssh/id_rsa ]; then ssh-keygen -t rsa -b 4096 -N \"\" -f /home/git/.ssh/id_rsa; fi"
14-
su git -c "if [ -f /home/git/.ssh/id_rsa.pub ]; then mv /home/git/.ssh/id_rsa.pub /home/git/.ssh/authorized_keys_proxy; fi"
13+
su git -c "if [ ! -f /home/git/.ssh/id_ed25519 ]; then ssh-keygen -t ed25519 -N \"\" -f /home/git/.ssh/id_ed25519; fi"
14+
su git -c "if [ -f /home/git/.ssh/id_ed25519.pub ]; then mv /home/git/.ssh/id_ed25519.pub /home/git/.ssh/authorized_keys_proxy; fi"
1515

1616
mkdir -p /home/git/gitlab-shell/bin/
1717
rm -f /home/git/gitlab-shell/bin/gitlab-shell
1818
tee -a /home/git/gitlab-shell/bin/gitlab-shell > /dev/null <<EOF
1919
#!/bin/sh
2020
21-
ssh -i /home/git/.ssh/id_rsa -p ${GITLAB_SSH_PORT} -o StrictHostKeyChecking=no [email protected] "SSH_ORIGINAL_COMMAND=\"\$SSH_ORIGINAL_COMMAND\" \$0 \$@"
21+
ssh -i /home/git/.ssh/id_ed25519 -p ${GITLAB_SSH_PORT} -o StrictHostKeyChecking=no [email protected] "SSH_ORIGINAL_COMMAND=\"\$SSH_ORIGINAL_COMMAND\" \$0 \$@"
2222
EOF
2323
chown git:git /home/git/gitlab-shell/bin/gitlab-shell
2424
chmod u+x /home/git/gitlab-shell/bin/gitlab-shell

0 commit comments

Comments
 (0)