From 6b20f0c2935df934ca67dd2e7911568503fc46ee Mon Sep 17 00:00:00 2001 From: Pascal Vizeli Date: Mon, 3 Feb 2020 13:53:58 +0100 Subject: [PATCH] Ssh update (#1039) * Change motd & fix .ssh * Update config.json * Fix root folder * Update CHANGELOG.md * Update run.sh * ssh: Fix new tmux windows, add add-on icon (#1038) Co-authored-by: Pascal Vizeli Co-authored-by: Franck Nijhof --- ssh/CHANGELOG.md | 7 +++++++ ssh/config.json | 2 +- ssh/data/.tmux.conf | 1 - ssh/data/motd | 18 ++++++++---------- ssh/data/run.sh | 10 ++++++---- ssh/icon.png | Bin 0 -> 6197 bytes 6 files changed, 22 insertions(+), 16 deletions(-) create mode 100644 ssh/icon.png diff --git a/ssh/CHANGELOG.md b/ssh/CHANGELOG.md index 9024e39..1db91ae 100644 --- a/ssh/CHANGELOG.md +++ b/ssh/CHANGELOG.md @@ -1,5 +1,12 @@ # Changelog +## 8.2 + +- Fix creation of new tmux terminal windows +- Add add-on icon +- Update welcome logo +- Fix SSH folder issue with authorized keys + ## 8.1 - Fix for non existing .bash_profile startup error diff --git a/ssh/config.json b/ssh/config.json index 0f785f9..f6d15de 100644 --- a/ssh/config.json +++ b/ssh/config.json @@ -1,6 +1,6 @@ { "name": "SSH server", - "version": "8.1", + "version": "8.2", "slug": "ssh", "description": "Allows connections over SSH", "url": "https://github.com/home-assistant/hassio-addons/tree/master/ssh", diff --git a/ssh/data/.tmux.conf b/ssh/data/.tmux.conf index 42f3a19..fff27cf 100644 --- a/ssh/data/.tmux.conf +++ b/ssh/data/.tmux.conf @@ -1,4 +1,3 @@ -set-option -g default-shell /bin/zsh set-option -g default-terminal $TERM set-option -g base-index 1 setw -g pane-base-index 1 diff --git a/ssh/data/motd b/ssh/data/motd index e6f1ddf..8180c6a 100644 --- a/ssh/data/motd +++ b/ssh/data/motd @@ -1,13 +1,11 @@ + _ _ _ _ _ +| | | | /\ (_) | | | | +| |__| | ___ _ __ ___ ___ / \ ___ ___ _ ___| |_ __ _ _ __ | |_ +| __ |/ _ \| '_ ` _ \ / _ \ / /\ \ / __/ __| / __| __/ _` | '_ \| __| +| | | | (_) | | | | | | __/ / ____ \\__ \__ \ \__ \ || (_| | | | | |_ +|_| |_|\___/|_| |_| |_|\___| /_/ \_\___/___/_|___/\__\__,_|_| |_|\__| + - _ _ _ - | | | | (_) - | |__| | __ _ ___ ___ _ ___ - | __ |/ _` / __/ __| | |/ _ \ - | | | | (_| \__ \__ \_| | (_) | - |_| |_|\__,_|___/___(_)_|\___/ - - - -Our Cli: +Our command line: $ hassio help diff --git a/ssh/data/run.sh b/ssh/data/run.sh index 93fa248..d5392da 100755 --- a/ssh/data/run.sh +++ b/ssh/data/run.sh @@ -9,12 +9,14 @@ bashio::log.info "Initializing add-on for use..." if bashio::config.has_value 'authorized_keys'; then bashio::log.info "Setup authorized_keys" - mkdir -p ~/.ssh + mkdir -p /data/.ssh + chmod 700 /data/.ssh + rm -f /data/.ssh/authorized_keys while read -r line; do - echo "$line" >> ~/.ssh/authorized_keys + echo "$line" >> /data/.ssh/authorized_keys done <<< "$(bashio::config 'authorized_keys')" - chmod 600 ~/.ssh/authorized_keys + chmod 600 /data/.ssh/authorized_keys sed -i s/#PasswordAuthentication.*/PasswordAuthentication\ no/ /etc/ssh/sshd_config # Unlock account @@ -103,4 +105,4 @@ WAIT_PIDS+=($!) # Wait until all is done bashio::log.info "SSH add-on is set up and running!" -wait "${WAIT_PIDS[@]}" \ No newline at end of file +wait "${WAIT_PIDS[@]}" diff --git a/ssh/icon.png b/ssh/icon.png new file mode 100644 index 0000000000000000000000000000000000000000..5c98c3f2b2eacbeeea81e68d22a660cde8bb5d0b GIT binary patch literal 6197 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 TkjfyL00000NkvXXu0mjfZ>q5L literal 0 HcmV?d00001