Drambluker
/
itdoxy-lab
mirror of https://github.com/Drambluker/gitea.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix bug introduced in #1759 preventing ssh server to launch 

- ssh/setup: test directive now check if a file exist in key path instead of a folder
- ssh/setup script was hanging waiting for an input about rewriting the key
  as the test case was returning true, when it should have been false
  (check if file is a folder instead of a file)
This commit is contained in:
Jean-Philippe Roemer 2015-10-12 22:13:22 +01:00
parent 5c6df9f31b
commit 9acf02ad7f
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
docker/s6/openssh/setup
View File

@ -1,23 +1,23 @@
#!/bin/sh #!/bin/sh
# Check if host keys are present, else create them # Check if host keys are present, else create them
if ! test -d /data/ssh/ssh_host_key; then if ! test -f /data/ssh/ssh_host_key; then
ssh-keygen -q -f /data/ssh/ssh_host_key -N '' -t rsa1 ssh-keygen -q -f /data/ssh/ssh_host_key -N '' -t rsa1
fi fi
if ! test -d /data/ssh/ssh_host_rsa_key; then if ! test -f /data/ssh/ssh_host_rsa_key; then
ssh-keygen -q -f /data/ssh/ssh_host_rsa_key -N '' -t rsa ssh-keygen -q -f /data/ssh/ssh_host_rsa_key -N '' -t rsa
fi fi
if ! test -d /data/ssh/ssh_host_dsa_key; then if ! test -f /data/ssh/ssh_host_dsa_key; then
ssh-keygen -q -f /data/ssh/ssh_host_dsa_key -N '' -t dsa ssh-keygen -q -f /data/ssh/ssh_host_dsa_key -N '' -t dsa
fi fi
if ! test -d /data/ssh/ssh_host_ecdsa_key; then if ! test -f /data/ssh/ssh_host_ecdsa_key; then
ssh-keygen -q -f /data/ssh/ssh_host_ecdsa_key -N '' -t ecdsa ssh-keygen -q -f /data/ssh/ssh_host_ecdsa_key -N '' -t ecdsa
fi fi
if ! test -d /data/ssh/ssh_host_ed25519_key; then if ! test -f /data/ssh/ssh_host_ed25519_key; then
ssh-keygen -q -f /data/ssh/ssh_host_ed25519_key -N '' -t ed25519 ssh-keygen -q -f /data/ssh/ssh_host_ed25519_key -N '' -t ed25519
fi fi