LAB-linuxserver/docker-openssh-server
1
0
Fork 0
mirror of https://github.com/linuxserver/docker-openssh-server.git synced 2026-02-05 11:37:30 +08:00
Code Issues Packages Projects Releases Wiki Activity

Address some shellcheck issues

Browse Source
This commit is contained in:
TheSpad 2022-04-16 13:58:57 +01:00
parent 6ec6f7e166
commit 720058cf4f
3 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
root/etc/cont-init.d/50-config
View File

@ -10,7 +10,7 @@ echo "User name is set to $USER_NAME"
# set password for abc to unlock it and set sudo access
sed -i "/${USER_NAME} ALL.*/d" /etc/sudoers
if [ "$SUDO_ACCESS" == "true" ]; then
if [ -n "$USER_PASSWORD" ] || [ -n "$USER_PASSWORD_FILE" -a -f "$USER_PASSWORD_FILE" ]; then
if [ -n "$USER_PASSWORD" ] || [ -n "$USER_PASSWORD_FILE" ] && [ -f "$USER_PASSWORD_FILE" ]; then
echo "${USER_NAME} ALL=(ALL) ALL" >> /etc/sudoers
echo "Sudo is enabled with password."
else
@ -23,7 +23,7 @@ fi
[[ -n "$USER_PASSWORD_FILE" ]] && [[ -f "$USER_PASSWORD_FILE" ]] && \
USER_PASSWORD=$(cat "$USER_PASSWORD_FILE") && \
echo "User password is retrieved from file."
USER_PASSWORD=${USER_PASSWORD:-$(< /dev/urandom tr -dc _A-Z-a-z-0-9 | head -c${1:-8};echo;)}
USER_PASSWORD=${USER_PASSWORD:-$(< /dev/urandom tr -dc _A-Z-a-z-0-9 | head -c"${1:-8}";echo;)}
echo "${USER_NAME}:${USER_PASSWORD}" | chpasswd
# symlink out ssh config directory
@ -61,12 +61,12 @@ if [ ! -f /config/.ssh/authorized_keys ];then
fi
[[ -n "$PUBLIC_KEY" ]] && \
[[ ! $(grep "$PUBLIC_KEY" /config/.ssh/authorized_keys) ]] && \
[[ ! $(grep "${PUBLIC_KEY}" /config/.ssh/authorized_keys) ]] && \
echo "$PUBLIC_KEY" >> /config/.ssh/authorized_keys && \
echo "Public key from env variable added"
[[ -n "$PUBLIC_KEY_URL" ]] && \
PUBLIC_KEY_DOWNLOADED=$(curl -s $PUBLIC_KEY_URL) && \
PUBLIC_KEY_DOWNLOADED=$(curl -s "$PUBLIC_KEY_URL") && \
[[ ! $(grep "$PUBLIC_KEY_DOWNLOADED" /config/.ssh/authorized_keys) ]] && \
echo "$PUBLIC_KEY_DOWNLOADED" >> /config/.ssh/authorized_keys && \
echo "Public key downloaded from '$PUBLIC_KEY_URL' added"

2
root/etc/services.d/openssh-server/log/run
View File

@ -3,4 +3,4 @@
USER_NAME=${USER_NAME:-linuxserver.io}
exec \
s6-setuidgid ${USER_NAME} s6-log n30 s10000000 S30000000 T !"gzip -nq9" /config/logs/openssh
s6-setuidgid "${USER_NAME}" s6-log n30 s10000000 S30000000 T !"gzip -nq9" /config/logs/openssh

2
root/etc/services.d/openssh-server/run
View File

@ -3,4 +3,4 @@
USER_NAME=${USER_NAME:-linuxserver.io}
exec 2>&1 \
s6-setuidgid ${USER_NAME} /usr/sbin/sshd.pam -D -e -p 2222
s6-setuidgid "${USER_NAME}" /usr/sbin/sshd.pam -D -e -p 2222