From 7639eef0e72921485e9e12f2b67ab381cd5114ae Mon Sep 17 00:00:00 2001
From: Pascal Vizeli <pvizeli@syshack.ch>
Date: Sun, 1 Mar 2020 14:42:31 +0100
Subject: [PATCH] Show information/warning if the SSH port is disable (#1156)

* Show information/warning if the SSH port is disable

* Update config.json

* Update CHANGELOG.md
---
 ssh/CHANGELOG.md                   | 94 ++----------------------------
 ssh/config.json                    |  2 +-
 ssh/rootfs/etc/services.d/sshd/run |  3 +-
 3 files changed, 7 insertions(+), 92 deletions(-)

diff --git a/ssh/CHANGELOG.md b/ssh/CHANGELOG.md
index bcd4e91..748ccb2 100644
--- a/ssh/CHANGELOG.md
+++ b/ssh/CHANGELOG.md
@@ -1,5 +1,9 @@
 # Changelog
 
+## 8.5.1
+
+- Show warning if SSH port is disabled
+
 ## 8.5.0
 
 - Add support for PulseAudio with new Audio backend
@@ -46,93 +50,3 @@
 
 - Added bash_profile as a persistent file
 
-## 6.4.0
-
-- Changed logging from DEBUG -> INFO
-
-## 6.3.0
-
-- Update Hass.io CLI to 3.1.0
-
-## 6.2.0
-
-- Update Hass.io CLI to 3.0.0
-
-## 6.1.0
-
-- Update Hass.io CLI to 2.3.0
-
-## 6.0.0
-
-- Update and pin base image to Alpine 3.10
-
-## 5.6.0
-
-- Fixes crash when using authorized keys
-
-## 5.5.0
-
-- Rewrite add-on onto Bashio
-- Added documentation to add-on repository
-- Code styling improvements
-
-## 5.4.0
-
-- Update Hass.io CLI to 2.2.0
-
-## 5.3.0
-
-- Fix: User root not allowed because account is locked
-
-## 5.2.0
-
-- Update Hass.io CLI to 2.1.0
-
-## 5.1.0
-
-- Map all serial devices into container for manual adjustments
-
-## 5.0.0
-
-- Update Hass.io CLI to 2.0.1, include bash completion
-
-## 4.0.0
-
-- Update Hass.io CLI to 1.4.0
-- Add new API role profile
-- Update OpenSSH to 7.7
-
-## 3.7.0
-
-- Add YAML highlighting for nano
-
-## 3.6.0
-
-- Update Hass.io CLI to 1.3.1
-
-## 3.5.0
-
-- Update Hass.io CLI to 1.3.0
-
-## 3.4.0
-
-- Update Hass.io CLI to 1.2.1
-
-## 3.3.0
-
-- Update Hass.io CLI to 1.1.2
-
-## 3.2.0
-
-- Downgrade Hass.io CLI to 1.0.1
-
-## 3.1.0
-
-- Update Hass.io CLI to 1.1.1
-- Change internal token handling for Hass.io API
-
-## 3.0.0
-
-- Use new base images
-- Add hassio-cli version 1.0
-- Use bash as default shell
diff --git a/ssh/config.json b/ssh/config.json
index 0d6ec38..85b8034 100644
--- a/ssh/config.json
+++ b/ssh/config.json
@@ -1,6 +1,6 @@
 {
   "name": "Terminal & SSH",
-  "version": "8.5.0",
+  "version": "8.5.1",
   "slug": "ssh",
   "description": "Allow logging in remotely to Home Assistant using SSH",
   "url": "https://github.com/home-assistant/hassio-addons/tree/master/ssh",
diff --git a/ssh/rootfs/etc/services.d/sshd/run b/ssh/rootfs/etc/services.d/sshd/run
index 7a25830..1a8692e 100644
--- a/ssh/rootfs/etc/services.d/sshd/run
+++ b/ssh/rootfs/etc/services.d/sshd/run
@@ -5,8 +5,9 @@
 
 # If SSH is disabled, use a fake sleep process
 if ! bashio::var.has_value "$(bashio::addon.port 22)"; then
+    bashio::log.warning "SSH port is disabled. Prevent start of SSH server." 
     exec sleep 864000
 fi
 
 bashio::log.info "Starting the SSH daemon..."
-exec /usr/sbin/sshd -D -e
\ No newline at end of file
+exec /usr/sbin/sshd -D -e