From 8bec12778a0fd8e5ac618e54e14c4f28d5d44f68 Mon Sep 17 00:00:00 2001 From: "Community Hass.io Add-ons Bot" Date: Wed, 10 Nov 2021 20:37:15 +0000 Subject: [PATCH] :arrow_up: Updating add-on SSH & Web Terminal to b757344 --- README.md | 6 +-- ssh/CHANGELOG.md | 1 + ssh/README.md | 4 +- ssh/config.json | 104 ----------------------------------------------- ssh/config.yaml | 88 +++++++++++++++++++++++++++++++++++++++ 5 files changed, 94 insertions(+), 109 deletions(-) delete mode 100644 ssh/config.json create mode 100644 ssh/config.yaml diff --git a/README.md b/README.md index 1bda00b99..f36da3e26 100644 --- a/README.md +++ b/README.md @@ -926,10 +926,10 @@ SOFTWARE. [sqlite-web-armhf-shield]: https://img.shields.io/badge/armhf-yes-green.svg [sqlite-web-armv7-shield]: https://img.shields.io/badge/armv7-yes-green.svg [sqlite-web-i386-shield]: https://img.shields.io/badge/i386-yes-green.svg -[addon-ssh]: https://github.com/hassio-addons/addon-ssh/tree/c3c45e3 -[addon-doc-ssh]: https://github.com/hassio-addons/addon-ssh/blob/c3c45e3/README.md +[addon-ssh]: https://github.com/hassio-addons/addon-ssh/tree/b757344 +[addon-doc-ssh]: https://github.com/hassio-addons/addon-ssh/blob/b757344/README.md [ssh-issue]: https://github.com/hassio-addons/addon-ssh/issues -[ssh-version-shield]: https://img.shields.io/badge/version-c3c45e3-blue.svg +[ssh-version-shield]: https://img.shields.io/badge/version-b757344-blue.svg [ssh-aarch64-shield]: https://img.shields.io/badge/aarch64-yes-green.svg [ssh-amd64-shield]: https://img.shields.io/badge/amd64-yes-green.svg [ssh-armhf-shield]: https://img.shields.io/badge/armhf-yes-green.svg diff --git a/ssh/CHANGELOG.md b/ssh/CHANGELOG.md index ea1ad7e40..36ec03cfa 100644 --- a/ssh/CHANGELOG.md +++ b/ssh/CHANGELOG.md @@ -1,4 +1,5 @@ # Changelog since v9.0.1 +- Migrate JSON config to YAML (#338) - Switch to centralized GitHub Action Workflows (#337) - ⬆️ Upgrades vim to 8.2.3437-r0 (#336) - ⬆️ Upgrades openssh to 8.6_p1-r3 (#335) diff --git a/ssh/README.md b/ssh/README.md index 8e86879a1..4c108f448 100644 --- a/ssh/README.md +++ b/ssh/README.md @@ -102,8 +102,8 @@ If you are more interested in stable releases of our add-ons: [patreon-shield]: https://frenck.dev/wp-content/uploads/2019/12/patreon.png [patreon]: https://www.patreon.com/frenck [project-stage-shield]: https://img.shields.io/badge/project%20stage-production%20ready-brightgreen.svg -[release-shield]: https://img.shields.io/badge/version-c3c45e3-blue.svg -[release]: https://github.com/hassio-addons/addon-ssh/tree/c3c45e3 +[release-shield]: https://img.shields.io/badge/version-b757344-blue.svg +[release]: https://github.com/hassio-addons/addon-ssh/tree/b757344 [screenshot]: https://github.com/hassio-addons/addon-ssh/raw/main/images/screenshot.png [ssh-audit-image]: https://github.com/hassio-addons/addon-ssh/raw/main/images/ssh-audit.png [ssh-audit]: https://github.com/arthepsy/ssh-audit diff --git a/ssh/config.json b/ssh/config.json deleted file mode 100644 index 22c33335a..000000000 --- a/ssh/config.json +++ /dev/null @@ -1,104 +0,0 @@ -{ - "name": "SSH & Web Terminal", - "version": "c3c45e3", - "slug": "ssh", - "description": "SSH & Web Terminal access to your Home Assistant instance", - "url": "https://github.com/hassio-addons/addon-ssh", - "advanced": true, - "startup": "services", - "ingress": true, - "ingress_port": 0, - "ingress_stream": true, - "panel_icon": "mdi:console", - "panel_title": "Terminal", - "homeassistant": "0.92.0b2", - "arch": [ - "aarch64", - "amd64", - "armhf", - "armv7", - "i386" - ], - "ports": { - "22/tcp": 22 - }, - "ports_description": { - "22/tcp": "SSH server port (make empty to disable)" - }, - "hassio_api": true, - "hassio_role": "manager", - "services": [ - "mysql:want", - "mqtt:want" - ], - "homeassistant_api": true, - "host_network": true, - "uart": true, - "usb": true, - "gpio": true, - "audio": true, - "apparmor": false, - "host_dbus": true, - "stdin": true, - "docker_api": true, - "privileged": [ - "NET_ADMIN", - "SYS_ADMIN", - "SYS_RAWIO", - "SYS_TIME", - "SYS_NICE" - ], - "devices": [ - "/dev/mem" - ], - "map": [ - "config:rw", - "ssl:rw", - "addons:rw", - "media:rw", - "share:rw", - "backup:rw" - ], - "journald": true, - "options": { - "ssh": { - "username": "hassio", - "password": "", - "authorized_keys": [], - "sftp": false, - "compatibility_mode": false, - "allow_agent_forwarding": false, - "allow_remote_port_forwarding": false, - "allow_tcp_forwarding": false - }, - "zsh": true, - "share_sessions": false, - "packages": [], - "init_commands": [] - }, - "schema": { - "log_level": "list(trace|debug|info|notice|warning|error|fatal)?", - "ssh": { - "username": "str", - "password": "password", - "authorized_keys": [ - "str" - ], - "sftp": "bool", - "compatibility_mode": "bool", - "allow_agent_forwarding": "bool", - "allow_remote_port_forwarding": "bool", - "allow_tcp_forwarding": "bool" - }, - "zsh": "bool", - "share_sessions": "bool", - "packages": [ - "str" - ], - "init_commands": [ - "str" - ], - "i_like_to_be_pwned": "bool?" - }, - "image": "ghcr.io/hassio-addons/ssh/{arch}" -} \ No newline at end of file diff --git a/ssh/config.yaml b/ssh/config.yaml new file mode 100644 index 000000000..22cce5ed0 --- /dev/null +++ b/ssh/config.yaml @@ -0,0 +1,88 @@ +advanced: true +apparmor: false +arch: +- aarch64 +- amd64 +- armhf +- armv7 +- i386 +audio: true +description: SSH & Web Terminal access to your Home Assistant instance +devices: +- /dev/mem +docker_api: true +gpio: true +hassio_api: true +hassio_role: manager +homeassistant: 0.92.0b2 +homeassistant_api: true +host_dbus: true +host_network: true +image: ghcr.io/hassio-addons/ssh/{arch} +ingress: true +ingress_port: 0 +ingress_stream: true +journald: true +map: +- config:rw +- ssl:rw +- addons:rw +- media:rw +- share:rw +- backup:rw +name: SSH & Web Terminal +options: + init_commands: [] + packages: [] + share_sessions: false + ssh: + allow_agent_forwarding: false + allow_remote_port_forwarding: false + allow_tcp_forwarding: false + authorized_keys: [] + compatibility_mode: false + password: '' + sftp: false + username: hassio + zsh: true +panel_icon: mdi:console +panel_title: Terminal +ports: + 22/tcp: 22 +ports_description: + 22/tcp: SSH server port (make empty to disable) +privileged: +- NET_ADMIN +- SYS_ADMIN +- SYS_RAWIO +- SYS_TIME +- SYS_NICE +schema: + i_like_to_be_pwned: bool? + init_commands: + - str + log_level: list(trace|debug|info|notice|warning|error|fatal)? + packages: + - str + share_sessions: bool + ssh: + allow_agent_forwarding: bool + allow_remote_port_forwarding: bool + allow_tcp_forwarding: bool + authorized_keys: + - str + compatibility_mode: bool + password: password + sftp: bool + username: str + zsh: bool +services: +- mysql:want +- mqtt:want +slug: ssh +startup: services +stdin: true +uart: true +url: https://github.com/hassio-addons/addon-ssh +usb: true +version: b757344