Revert "Fix account locking issue (#552)" (#553)

This reverts commit b2355ae596.
This commit is contained in:
Pascal Vizeli
2019-03-16 15:50:08 +01:00
committed by GitHub
parent b2355ae596
commit dd44cc922a
5 changed files with 5 additions and 25 deletions

View File

@@ -1,8 +1,5 @@
# Changelog # Changelog
## 5.3
- Fix: User root not allowed because account is locked
## 5.2 ## 5.2
- Update Hass.io CLI to 2.1.0 - Update Hass.io CLI to 2.1.0

View File

@@ -27,6 +27,5 @@ RUN apk add --no-cache curl \
# Copy data # Copy data
COPY run.sh / COPY run.sh /
COPY motd /etc/ COPY motd /etc/
COPY sshd_config /etc/ssh/
CMD [ "/run.sh" ] CMD [ "/run.sh" ]

View File

@@ -1,6 +1,6 @@
{ {
"name": "SSH server", "name": "SSH server",
"version": "5.3", "version": "5.2",
"slug": "ssh", "slug": "ssh",
"description": "Allows connections over SSH", "description": "Allows connections over SSH",
"url": "https://home-assistant.io/addons/ssh/", "url": "https://home-assistant.io/addons/ssh/",

View File

@@ -7,6 +7,10 @@ KEYS_PATH=/data/host_keys
AUTHORIZED_KEYS=$(jq --raw-output ".authorized_keys[]" $CONFIG_PATH) AUTHORIZED_KEYS=$(jq --raw-output ".authorized_keys[]" $CONFIG_PATH)
PASSWORD=$(jq --raw-output ".password" $CONFIG_PATH) PASSWORD=$(jq --raw-output ".password" $CONFIG_PATH)
# Init defaults config
sed -i s/#PermitRootLogin.*/PermitRootLogin\ yes/ /etc/ssh/sshd_config
sed -i s/#LogLevel.*/LogLevel\ DEBUG/ /etc/ssh/sshd_config
if [ -n "$AUTHORIZED_KEYS" ]; then if [ -n "$AUTHORIZED_KEYS" ]; then
echo "[INFO] Setup authorized_keys" echo "[INFO] Setup authorized_keys"

View File

@@ -1,20 +0,0 @@
# This is the sshd server system-wide configuration file. See
# sshd_config(5) for more information.
# Logging
LogLevel DEBUG
# Default
AllowTcpForwarding no
GatewayPorts no
X11Forwarding no
Subsystem sftp /usr/lib/ssh/sftp-server
# Authentication:
PermitRootLogin yes
#PasswordAuthentication no
#PermitEmptyPasswords no